diff options
| author | Xiretza <xiretza@xiretza.xyz> | 2021-05-09 14:42:22 +0200 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2021-05-10 07:56:17 +0200 |
| commit | 39802c98c3bac9782606fc776f2ff7d1d6e7265f (patch) | |
| tree | ebfc685de43083e207d39b26a513793b43e78718 | |
| parent | 55a5513c14afb209b06ea86bbb918f6e13f1e50c (diff) | |
| download | ghdl-39802c98c3bac9782606fc776f2ff7d1d6e7265f.tar.gz ghdl-39802c98c3bac9782606fc776f2ff7d1d6e7265f.tar.bz2 ghdl-39802c98c3bac9782606fc776f2ff7d1d6e7265f.zip | |
configure, Makefile.in: use CXXFLAGS from environment
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rwxr-xr-x | configure | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 7f5824b53..87d18c2f2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,6 +16,7 @@ CC=@CC@ CFLAGS=@CFLAGS@ CXX=@CXX@ +CXXFLAGS=@CXXFLAGS@ build=@build@ srcdir=@srcdir@ abs_srcdir=@abs_srcdir@ @@ -99,6 +100,7 @@ endif WARN_CFLAGS=-Wall CFLAGS:=$(OPT_FLAGS) $(WARN_CFLAGS) $(CFLAGS) +CXXFLAGS:=$(OPT_FLAGS) $(WARN_CFLAGS) $(CXXFLAGS) GNAT_BARGS=-bargs -E @@ -346,7 +348,7 @@ ghdl_llvm_jit$(EXEEXT): $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) $(ORTHO_DEPS) \ llvm-cbindings.o: $(srcdir)/src/ortho/$(llvm_be)/llvm-cbindings.cpp $(CXX) -c `$(LLVM_CONFIG) --includedir --cxxflags` \ - $(OPT_FLAGS) $(COVERAGE_FLAGS) -o $@ $< + $(COVERAGE_FLAGS) $(CXXFLAGS) -o $@ $< libs.vhdl.llvmjit: ghdl_llvm_jit$(EXEEXT) $(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_llvm$(EXEEXT) GHDL_FLAGS="" VHDLLIBS_COPY_OBJS=no vhdl.libs.all @@ -27,6 +27,7 @@ backend=mcode CC=${CC:-gcc} CXX=${CXX:-clang++} CFLAGS=${CFLAGS:--g} +CXXFLAGS=${CXXFLAGS:--g} GNATMAKE=${GNATMAKE:-gnatmake} ADA_FLAGS=${ADA_FLAGS:-} MAKE=${MAKE:-make} @@ -53,7 +54,7 @@ PIC_FLAGS=-fPIC show_help=no progname=$0 -subst_vars="CC CXX GNATMAKE ADA_FLAGS MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version" +subst_vars="CC CXX GNATMAKE ADA_FLAGS MAKE CFLAGS CXXFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version" # Find srcdir srcdir=`dirname $progname` |