diff options
| author | Tristan Gingold | 2015-09-17 08:06:36 +0200 |
|---|---|---|
| committer | Tristan Gingold | 2015-09-17 08:06:36 +0200 |
| commit | e5e1f179fdd64fa1abc89b5a0b00209c0e3bcba7 (patch) | |
| tree | 9bb895e5c8d7df33b2a444a79443bf8381b3edad | |
| parent | 6e118c1d32b9a8ad674e765a52f861b2db5b34f5 (diff) | |
| download | ghdl-e5e1f179fdd64fa1abc89b5a0b00209c0e3bcba7.tar.gz ghdl-e5e1f179fdd64fa1abc89b5a0b00209c0e3bcba7.tar.bz2 ghdl-e5e1f179fdd64fa1abc89b5a0b00209c0e3bcba7.zip | |
Fix GRT_EXTRA_LIB, remove grt-arch (unused).
| -rw-r--r-- | src/grt/Makefile.inc | 19 | ||||
| -rw-r--r-- | src/grt/grt-arch.ads | 2 |
2 files changed, 7 insertions, 14 deletions
diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc index 5b64a54..af217e1 100644 --- a/src/grt/Makefile.inc +++ b/src/grt/Makefile.inc @@ -45,24 +45,25 @@ endif GRT_ELF_OPTS:=-Wl,--version-script=@/grt.ver -Wl,--export-dynamic # Set target files. -ifeq ($(filter-out mingw32,$(arch) $(osys)),) +ifeq ($(filter-out mingw32,$(osys)),) GRT_TARGET_OBJS=jumps.o math.o clock.o else GRT_TARGET_OBJS=jumps.o times.o - ifeq ($(filter-out linux,$(arch) $(osys)),) + ifeq ($(filter-out linux,$(osys)),) GRT_EXTRA_LIB=-ldl -lm $(GRT_ELF_OPTS) endif - ifeq ($(filter-out netbsd freebsd% dragonfly%,$(arch) $(osys)),) + ifeq ($(filter-out netbsd freebsd% dragonfly%,$(osys)),) GRT_EXTRA_LIB=-lm $(GRT_ELF_OPTS) endif - ifeq ($(filter-out solaris%,$(arch) $(osys)),) + ifeq ($(filter-out solaris%,$(osys)),) GRT_EXTRA_LIB=-ldl -lm endif - ifeq ($(filter-out darwin%,$(arch) $(osys)),) + ifeq ($(filter-out darwin%,$(osys)),) GRT_EXTRA_LIB= endif endif +# Object files (from C) for fst GRT_FST_OBJS := fstapi.o lz4.o fastlz.o # Additionnal object files (C or asm files). @@ -75,8 +76,6 @@ ifeq ($(GRT_USE_PTHREADS),y) GRT_EXTRA_LIB+=-lpthread endif -GRT_ARCH?=None - # Configuration pragmas. GRT_PRAGMA_FLAG=-gnatec$(GRTSRCDIR)/grt.adc -gnat05 @@ -85,7 +84,7 @@ GRT_ADACOMPILE=$(ADAC) -c $(GRT_FLAGS) $(GRT_PRAGMA_FLAG) -o $@ $< grt-all: libgrt.a grt.lst -libgrt.a: $(GRT_ADD_OBJS) run-bind.o main.o grt-files # grt-arch.ads +libgrt.a: $(GRT_ADD_OBJS) run-bind.o main.o grt-files $(RM) -f $@ $(AR) rcv $@ `sed -e "/^-/d" < grt-files` $(GRT_ADD_OBJS) \ run-bind.o main.o @@ -153,10 +152,6 @@ grt-files: run-bind.adb sed -e "1,/-- *BEGIN/d" -e "/-- *END/,\$$d" \ -e "s/ -- //" < $< > $@ -grt-arch.ads: - echo "With Grt.Arch_$(GRT_ARCH);" > $@ - echo "Package Grt.Arch renames Grt.Arch_$(GRT_ARCH);" >> $@ - # Remove local files (they are now in the libgrt library). # Also, remove the -shared option, in order not to build a shared library # instead of an executable. diff --git a/src/grt/grt-arch.ads b/src/grt/grt-arch.ads deleted file mode 100644 index 5f5aa0e..0000000 --- a/src/grt/grt-arch.ads +++ /dev/null @@ -1,2 +0,0 @@ -With Grt.Arch_None; -Package Grt.Arch renames Grt.Arch_None; |