From 79730a3b2683dba745663fa3b907f564bee8a0ef Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 1 Apr 2015 10:27:34 -0700 Subject: 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). --- sim/ppc/Makefile.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sim/ppc') diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index d3a9f16ffe1..964a7b3bf70 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -152,19 +152,13 @@ MAKEOVERRIDES= LIB_INCLUDES = -I$(srcdir)/../../include BFD_INCLUDES = -I../../bfd -I$(srcdir)/../../bfd GDB_INCLUDES = -I../../gdb -I$(srcdir)/../../gdb -I$(srcdir)/../../gdb/config -ZLIBINC = @zlibinc@ -INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) $(ZLIBINC) +INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) LIBIBERTY_LIB = ../../libiberty/libiberty.a -BFD_LIB = ../../bfd/libbfd.a $(ZLIB) +BFD_LIB = ../../bfd/libbfd.a ZLIB = @zlibdir@ -lz -# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is -# -I../zlib, unless we were configured with --with-system-zlib, in which -# case both are empty. -ZLIB = @zlibdir@ -lz - LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ INTL_CFLAGS = @INCINTL@ -- cgit v1.2.3-65-gdbad