diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-04-01 10:15:13 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-04-01 10:15:13 -0700 |
| commit | 0ceaf1ec964f8674c57c6a522cb38b6f758a0929 (patch) | |
| tree | a6abffda322f1d10e5d718851a920a6360e092b8 /sim/ppc | |
| parent | a0bde39842936bb13f88f13a688b181432aa2593 (diff) | |
| download | fsf-binutils-gdb-0ceaf1ec964f8674c57c6a522cb38b6f758a0929.zip fsf-binutils-gdb-0ceaf1ec964f8674c57c6a522cb38b6f758a0929.tar.gz fsf-binutils-gdb-0ceaf1ec964f8674c57c6a522cb38b6f758a0929.tar.bz2 | |
Regenerate configure in sim
* arm/configure: Regenerated.
* avr/configure: Likewise.
* bfin/configure: Likewise.
* common/configure: Likewise.
* cr16/configure: Likewise.
* cris/configure: Likewise.
* d10v/configure: Likewise.
* erc32/configure: Likewise.
* frv/configure: Likewise.
* ft32/configure: Likewise.
* h8300/configure: Likewise.
* igen/configure: Likewise.
* iq2000/configure: Likewise.
* lm32/configure: Likewise.
* m32c/configure: Likewise.
* m32r/configure: Likewise.
* m68hc11/configure: Likewise.
* mcore/configure: Likewise.
* microblaze/configure: Likewise.
* mips/configure: Likewise.
* mn10300/configure: Likewise.
* moxie/configure: Likewise.
* msp430/configure: Likewise.
* ppc/configure: Likewise.
* rl78/configure: Likewise.
* rx/configure: Likewise.
* sh/configure: Likewise.
* sh64/configure: Likewise.
* v850/configure: Likewise.
Diffstat (limited to 'sim/ppc')
| -rw-r--r-- | sim/ppc/Makefile.in | 7 | ||||
| -rwxr-xr-x | sim/ppc/configure | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 92a5812..d3a9f16 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -160,6 +160,11 @@ LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a $(ZLIB) 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@ @@ -555,7 +560,7 @@ PACKAGE_OBJ = @sim_pk_obj@ psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) - $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) + $(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) run: psim rm -f run$(EXEEXT) diff --git a/sim/ppc/configure b/sim/ppc/configure index 85ce1a0..d42c285 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -6824,8 +6824,10 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= - zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= + fi fi |