diff options
| author | Brian Drummond | 2014-01-18 15:33:13 +0000 |
|---|---|---|
| committer | Brian Drummond | 2014-01-18 15:33:13 +0000 |
| commit | 6c298ee5492078aab9de4ebd488c20b67b529f47 (patch) | |
| tree | 270d2173fc03b843f71a21fbdfc8e37e7e97e709 | |
| parent | 680f5421af7cb1b4d96e5b8a30aa3f87f9aacd2b (diff) | |
| download | ghdl-6c298ee5492078aab9de4ebd488c20b67b529f47.tar.gz ghdl-6c298ee5492078aab9de4ebd488c20b67b529f47.tar.bz2 ghdl-6c298ee5492078aab9de4ebd488c20b67b529f47.zip | |
Fix include/library paths for gmp/mpc/mpfr files in gcc builds
| -rw-r--r-- | ortho/gcc/Makefile | 12 | ||||
| -rw-r--r-- | ortho/gcc/Makefile.inc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ortho/gcc/Makefile b/ortho/gcc/Makefile index da64a29..1c6d5c2 100644 --- a/ortho/gcc/Makefile +++ b/ortho/gcc/Makefile @@ -17,20 +17,20 @@ include $(orthobe_srcdir)/Makefile.inc ORTHO_BASENAME=$(orthobe_srcdir)/ortho_gcc ORTHO_PACKAGE=Ortho_Gcc -#LIBFLAGS=$(HOME)/dist/mpfr-2.3.1/.libs/libmpfr.a $(HOME)/dist/gmp-4.2.2/.libs/libgmp.a -LIBFLAGS=-L$(AGCC_GCCOBJ_DIR)./mpfr/.libs -L$(AGCC_GCCOBJ_DIR)./mpc/src/.libs -lmpc -lmpfr -lgmp -lz -ldl -lstdc++ -#$(AGCC_GCCOBJ_DIR)/intl/libintl.a -liconv -lz +# Supplied by main GCC Makefile, copied here for compatibility with same +GMPLIBS = -L$(AGCC_GCCOBJ_DIR)./gmp/.libs -L$(AGCC_GCCOBJ_DIR)./mpfr/.libs -L$(AGCC_GCCOBJ_DIR)./mpc/src/.libs -lmpc -lmpfr -lgmp +GMPINC = -I$(AGCC_GCCOBJ_DIR)./gmp -I$(AGCC_GCCSRC_DIR)/gmp -I$(AGCC_GCCOBJ_DIR)./mpfr -I$(AGCC_GCCSRC_DIR)/mpfr -I$(AGCC_GCCSRC_DIR)/mpc/src + +LIBFLAGS=$(GMPLIBS) -lz -ldl -lstdc++ + $(ortho_exec): $(AGCC_DEPS) $(ORTHO_BASENAME).ads force $(GNATMAKE) -m -o $@ -g -aI$(ortho_srcdir) \ -aI$(ortho_srcdir)/gcc $(GNAT_FLAGS) ortho_gcc-main \ -bargs -E -largs $(AGCC_OBJS) \ - $(AGCC_GCCOBJ_DIR)gcc/libbackend.a \ $(AGCC_GCCOBJ_DIR)gcc/libcommon-target.a \ $(AGCC_GCCOBJ_DIR)gcc/libcommon.a \ - $(AGCC_GCCOBJ_DIR)libcpp/libcpp.a \ $(AGCC_GCCOBJ_DIR)libbacktrace/.libs/libbacktrace.a \ - $(AGCC_GCCOBJ_DIR)libiberty/libiberty.a \ $(AGCC_GCCOBJ_DIR)libdecnumber/libdecnumber.a \ $(LIBFLAGS) #-static diff --git a/ortho/gcc/Makefile.inc b/ortho/gcc/Makefile.inc index 3416cf9..c7f9a6a 100644 --- a/ortho/gcc/Makefile.inc +++ b/ortho/gcc/Makefile.inc @@ -24,7 +24,7 @@ AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ - -I$(AGCC_GCCSRC_DIR)/libcpp/include + -I$(AGCC_GCCSRC_DIR)/libcpp/include $(GMPINC) AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) AGCC_LOCAL_OBJS=ortho-lang.o |