diff options
| author | Xiretza <xiretza@xiretza.xyz> | 2021-05-09 14:03:01 +0200 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2021-05-10 07:56:17 +0200 |
| commit | fe128c2b5af89d9a0a0e866fe5ecb3363cde2114 (patch) | |
| tree | 225835635265926f67608e91f3ba5af56c830cec | |
| parent | 8402fd01aea378db2541ccd56895f18c3c7f8bab (diff) | |
| download | ghdl-fe128c2b5af89d9a0a0e866fe5ecb3363cde2114.tar.gz ghdl-fe128c2b5af89d9a0a0e866fe5ecb3363cde2114.tar.bz2 ghdl-fe128c2b5af89d9a0a0e866fe5ecb3363cde2114.zip | |
Makefile.in: use CFLAGS from configure
| -rw-r--r-- | Makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index c11375dc2..75aa0d1a8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,6 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <gnu.org/licenses>. CC=@CC@ +CFLAGS=@CFLAGS@ CXX=@CXX@ build=@build@ srcdir=@srcdir@ @@ -198,7 +199,7 @@ ghdl_mcode$(EXEEXT): $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) $(ORTHO_DEPS) \ $(GNATMAKE) -o $@ -gnat12 $(GHDL_MCODE_INCFLAGS) $(GNATFLAGS) -gnatw.A ghdl_jit.adb $(GNAT_BARGS) -largs memsegs_c.o chkstk.o $(GRT_ADD_OBJS) $(LDFLAGS) $(GNAT_LARGS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB) $(GRT_EXEC_OPTS)) memsegs_c.o: $(srcdir)/src/ortho/mcode/memsegs_c.c - $(CC) -c $(OPT_FLAGS) $(COVERAGE_FLAGS) -o $@ $< + $(CC) -c $(OPT_FLAGS) $(COVERAGE_FLAGS) $(CFLAGS) -o $@ $< libs.vhdl.mcode: ghdl_mcode$(EXEEXT) $(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_mcode$(EXEEXT) GHDL_FLAGS="" VHDL_COPY_OBJS=no vhdl.libs.all @@ -365,7 +366,7 @@ ghdl1-llvm$(EXEEXT): version.ads force ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNATFLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \ LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)" \ - CFLAGS="$(WARN_FLAGS) $(OPT_FLAGS) $(COVERAGE_FLAGS)" \ + CFLAGS="$(WARN_FLAGS) $(OPT_FLAGS) $(COVERAGE_FLAGS) $(CFLAGS)" \ GNATMAKE="$(GNATMAKE)" all oread-llvm$(EXEEXT): force @@ -485,10 +486,10 @@ libghw$(SOEXT): libghw.o $(CC) $(PIC_FLAGS) -shared -o lib/$@ libghw.o ghwdump.o: $(srcdir)/ghw/ghwdump.c $(srcdir)/ghw/libghw.h - $(CC) -c -o $@ $< $(OPT_FLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) + $(CC) -c -o $@ $< $(OPT_FLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) $(CFLAGS) libghw.o: $(srcdir)/ghw/libghw.c $(srcdir)/ghw/libghw.h - $(CC) $(PIC_FLAGS) -c -o $@ $< $(OPT_FLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) + $(CC) $(PIC_FLAGS) -c -o $@ $< $(OPT_FLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) $(CFLAGS) all.ghw: ghwdump$(EXEEXT) libghw$(SOEXT) @@ -529,10 +530,10 @@ uninstall.grt: ################ VPI ##################################################### vpi_thunk.o: $(GRTSRCDIR)/vpi_thunk.c $(GRTSRCDIR)/vpi_thunk.h - $(CC) -c -o $@ $< $(PIC_FLAGS) $(OPT_FLAGS) $(WARN_CFLAGS) + $(CC) -c -o $@ $< $(PIC_FLAGS) $(OPT_FLAGS) $(WARN_CFLAGS) $(CFLAGS) vhpi_thunk.o: $(GRTSRCDIR)/vhpi_thunk.c $(GRTSRCDIR)/vhpi_thunk.h - $(CC) -c -o $@ $< $(PIC_FLAGS) $(OPT_FLAGS) $(WARN_CFLAGS) + $(CC) -c -o $@ $< $(PIC_FLAGS) $(OPT_FLAGS) $(WARN_CFLAGS) $(CFLAGS) lib/libghdlvpi$(SOEXT): vpi_thunk.o vhpi_thunk.o $(CC) -o $@ $^ -shared $(SHLIB_FLAGS) |