diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2015-04-01 10:27:34 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2015-04-01 10:27:43 -0700 |
commit | 79730a3b2683dba745663fa3b907f564bee8a0ef (patch) | |
tree | 442859957650b75ec59b2542a614fdfe69eb3f72 /sim/common | |
parent | 0ceaf1ec964f8674c57c6a522cb38b6f758a0929 (diff) | |
download | gdb-79730a3b2683dba745663fa3b907f564bee8a0ef.zip gdb-79730a3b2683dba745663fa3b907f564bee8a0ef.tar.gz gdb-79730a3b2683dba745663fa3b907f564bee8a0ef.tar.bz2 |
Fix sim build
* common/Make-common.in (CSEARCH): Remove $(ZLIBINC).
(BFD_LIB): Remove $(ZLIB).
(CONFIG_LIBS): Add $(ZLIB).
* ppc/Makefile.in (ZLIBINC): Removed.
(INCLUDES): Remove $(ZLIBINC).
(BFD_LIB): Remove $(ZLIB).
Diffstat (limited to 'sim/common')
-rw-r--r-- | sim/common/Make-common.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 345d1db..0b1f85a 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -248,21 +248,20 @@ CSEARCH = -I. -I$(srcdir) -I../common -I$(srccom) \ -I../../include -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I../../opcodes -I$(srcroot)/opcodes \ - @INCINTL@ $(ZLIBINC) + @INCINTL@ ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(CFLAGS) BUILD_CFLAGS = -g -O $(CSEARCH) COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) ZLIB = @zlibdir@ -lz -ZLIBINC = @zlibinc@ LIBIBERTY_LIB = ../../libiberty/libiberty.a -BFD_LIB = ../../bfd/libbfd.a $(ZLIB) +BFD_LIB = ../../bfd/libbfd.a @PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@ OPCODES_LIB = ../../opcodes/libopcodes.a LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ -CONFIG_LIBS = @LIBS@ +CONFIG_LIBS = @LIBS@ $(ZLIB) LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \ $(SIM_EXTRA_LIBDEPS) EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ |