diff options
| author | Xiretza <xiretza@xiretza.xyz> | 2021-05-09 14:23:59 +0200 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2021-05-10 07:56:17 +0200 |
| commit | 94c27faea6338262c1e5c31fdd7b5f832ff2ac95 (patch) | |
| tree | 802509069d49943e8907aeaa2a2f6bde0c3e10f5 /Makefile.in | |
| parent | eeaba940704a7d2acc2a2d087548560d5cc90030 (diff) | |
| download | ghdl-94c27faea6338262c1e5c31fdd7b5f832ff2ac95.tar.gz ghdl-94c27faea6338262c1e5c31fdd7b5f832ff2ac95.tar.bz2 ghdl-94c27faea6338262c1e5c31fdd7b5f832ff2ac95.zip | |
Makefile.in: use LDFLAGS
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 5c149c234..df92e0b17 100644 --- a/Makefile.in +++ b/Makefile.in @@ -312,7 +312,7 @@ ghdl1-gcc$(EXEEXT): version.ads force ghdl_gcc$(EXEEXT): version.ads $(GRT_SYNTH_OBJS) force $(GNATMAKE) $(GHDL_GCC_INCFLAGS) -aI$(srcdir)/src/ghdldrv \ $(GNATFLAGS) ghdl_gcc $(GNAT_BARGS) \ - -largs $(GRT_SYNTH_OBJS) + -largs $(LDFLAGS) $(GRT_SYNTH_OBJS) libs.vhdl.local_gcc: ghdl_gcc$(EXEEXT) ghdl1-gcc$(EXEEXT) $(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_gcc$(EXEEXT) GHDL_FLAGS="--GHDL1=$(PWD)/ghdl1-gcc$(EXEEXT) $(LIB_CFLAGS)" vhdl.libs.all libs.vhdl.standard @@ -398,7 +398,7 @@ uninstall.llvm: uninstall.llvm.program uninstall.grt GHDL_SIMUL_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv -aI$(srcdir)/src/vhdl/simulate -aI$(srcdir)/src/synth ghdl_simul$(EXEEXT): $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) version.ads force - $(GNATMAKE) $(GHDL_SIMUL_INCFLAGS) $(GNATFLAGS) -gnat12 ghdl_simul $(GNAT_BARGS) -largs $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) + $(GNATMAKE) $(GHDL_SIMUL_INCFLAGS) $(GNATFLAGS) -gnat12 ghdl_simul $(GNAT_BARGS) -largs $(LDFLAGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) libs.vhdl.simul: ghdl_simul$(EXEEXT) $(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_simul$(EXEEXT) GHDL_FLAGS="" VHDLLIBS_COPY_OBJS=no vhdl.libs.all @@ -425,7 +425,7 @@ LIBGHDL_GRT_OBJS= pic/grt-cstdio.o lib/$(libghdl_name): $(GRT_SRC_DEPS) $(LIBGHDL_GRT_OBJS) version.ads force # Use -g for gnatlink so that the binder file is not removed. We need # it for libghdl.a - $(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ -gnat12 $(GNATFLAGS) $(PIC_FLAGS) $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -g -shared $(SHLIB_FLAGS) $(LIBGHDL_GRT_OBJS) + $(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ -gnat12 $(GNATFLAGS) $(PIC_FLAGS) $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -g -shared $(SHLIB_FLAGS) $(LDFLAGS) $(LIBGHDL_GRT_OBJS) # On windows, gnatmake (via Osint.Executable_Name) always appends .exe # Adjust. (Other solution: use gnatmake for compilation and binding, # then use gnatlink directly for linking). @@ -482,10 +482,10 @@ libghdl-py.tgz: GHWDUMP_OBJS=ghwdump.o libghw.o ghwdump$(EXEEXT): $(GHWDUMP_OBJS) - $(CC) -o $@ $(GHWDUMP_OBJS) + $(CC) $(LDFLAGS) -o $@ $(GHWDUMP_OBJS) libghw$(SOEXT): libghw.o - $(CC) $(PIC_FLAGS) -shared -o lib/$@ libghw.o + $(CC) $(PIC_FLAGS) $(LDFLAGS) -shared -o lib/$@ libghw.o ghwdump.o: $(srcdir)/ghw/ghwdump.c $(srcdir)/ghw/libghw.h $(CC) -c -o $@ $< $(COVERAGE_FLAGS) $(CFLAGS) @@ -538,7 +538,7 @@ vhpi_thunk.o: $(GRTSRCDIR)/vhpi_thunk.c $(GRTSRCDIR)/vhpi_thunk.h $(CC) -c -o $@ $< $(PIC_FLAGS) $(CFLAGS) lib/libghdlvpi$(SOEXT): vpi_thunk.o vhpi_thunk.o - $(CC) -o $@ $^ -shared $(SHLIB_FLAGS) + $(CC) $(SHLIB_FLAGS) $(LDFLAGS) -shared -o $@ $^ all.vpi: lib/libghdlvpi$(SOEXT) |