diff options
| author | Tristan Gingold <tgingold@free.fr> | 2023-01-05 18:15:30 +0100 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2023-01-05 22:19:11 +0100 |
| commit | f490b94d53c8d1d2cfac9abc59e3b29488cda16b (patch) | |
| tree | 9f9f98e4e912b667298017f22356aeb8939ccee6 | |
| parent | 80198720f223c8aebee3961f4015575818a7eff4 (diff) | |
| download | ghdl-f490b94d53c8d1d2cfac9abc59e3b29488cda16b.tar.gz ghdl-f490b94d53c8d1d2cfac9abc59e3b29488cda16b.tar.bz2 ghdl-f490b94d53c8d1d2cfac9abc59e3b29488cda16b.zip | |
simul: do not link with fst or vpi c files
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | src/grt/Makefile.inc | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 22b65d644..d722e94d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -416,7 +416,7 @@ uninstall.llvm: uninstall.llvm.program uninstall.grt GHDL_SIMUL_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv -aI$(srcdir)/src/simul -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 $(LDFLAGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) $(sundials_ldflags) + $(GNATMAKE) $(GHDL_SIMUL_INCFLAGS) $(GNATFLAGS) -gnat12 ghdl_simul $(GNAT_BARGS) -largs $(LDFLAGS) $(GRT_C_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) $(sundials_ldflags) 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 diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc index 2ca9e9420..6a91dd20b 100644 --- a/src/grt/Makefile.inc +++ b/src/grt/Makefile.inc @@ -97,8 +97,7 @@ endif GRT_FST_OBJS := fstapi.o lz4.o fastlz.o # Additionnal object files (C or asm files). -GRT_BASE_C_OBJS:=$(GRT_TARGET_OBJS) grt-cstdio.o grt-cgnatrts.o -GRT_ADD_OBJS:=$(GRT_BASE_C_OBJS) grt-cvpi.o grt-cvhpi.o grt-cdynload.o $(GRT_FST_OBJS) +GRT_C_OBJS:=$(GRT_TARGET_OBJS) grt-cstdio.o grt-cgnatrts.o # Source files create by grt. GRT_SRC_DEPS:=grt-backtraces-impl.ads @@ -106,14 +105,14 @@ GRT_SRC_DEPS:=grt-backtraces-impl.ads #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) GRT_CFLAGS+=-DUSE_THREADS - GRT_ADD_OBJS+=grt-cthreads.o + GRT_C_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif ifeq ($(with_sundials),true) - GRT_ADD_OBJS+=grt-sundials_c.o + GRT_C_OBJS+=grt-sundials_c.o else - GRT_ADD_OBJS+=grt-no_sundials_c.o + GRT_C_OBJS+=grt-no_sundials_c.o endif GRT_LIBBACKTRACE= @@ -121,6 +120,8 @@ ifneq ($(LIBBACKTRACE),) GRT_LIBBACKTRACE=libbacktrace.a endif +GRT_ADD_OBJS:=$(GRT_C_OBJS) grt-cvpi.o grt-cvhpi.o grt-cdynload.o $(GRT_FST_OBJS) + # MSYS2 tries to be clever with paths in command line: it replaces msys2 paths # by Windows paths. So for example, /bin/ls becomes c:/mingw64/bin/ls # However, this is not always obvious to detect paths. In our case, msys2 |