Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.4/370-bootstrap-target_lib_path.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 16:23:27 2011 +0100 (2011-12-31)
changeset 2814 3dc2727ebffc
permissions -rw-r--r--
cc/gcc: add option to use system zlib

In some cases, it might be desirable to use the system zlib

Eg. because latest gcc seem to be totally borked when it comes
to multilib, and tries to build a multilib host zlib, when it
is *absolutely* *not* needed: we want mulitlib on the target,
not on the host! Sigh... :-(

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 ChangeLog:

     2 2010-01-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

     3 

     4 	PR bootstrap/41818

     5 	* Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH

     6 	to $(RPATH_ENVVAR) if bootstrapping.

     7 	* Makefile.in: Regenerate.

     8 

     9 diff -durN gcc-4.4.4.orig/Makefile.in gcc-4.4.4/Makefile.in

    10 --- gcc-4.4.4.orig/Makefile.in	2009-04-25 06:10:29.000000000 +0200

    11 +++ gcc-4.4.4/Makefile.in	2010-05-16 19:38:17.000000000 +0200

    12 @@ -245,7 +245,10 @@

    13  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \

    14  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \

    15  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \

    16 -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);

    17 +@if gcc-bootstrap

    18 +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \

    19 +@endif gcc-bootstrap

    20 +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);

    21  

    22  RAW_CXX_TARGET_EXPORTS = \

    23  	$(BASE_TARGET_EXPORTS) \

    24 diff -durN gcc-4.4.4.orig/Makefile.tpl gcc-4.4.4/Makefile.tpl

    25 --- gcc-4.4.4.orig/Makefile.tpl	2009-04-14 10:57:33.000000000 +0200

    26 +++ gcc-4.4.4/Makefile.tpl	2010-05-16 19:38:17.000000000 +0200

    27 @@ -248,7 +248,10 @@

    28  	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \

    29  	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \

    30  	WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \

    31 -	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);

    32 +@if gcc-bootstrap

    33 +	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \

    34 +@endif gcc-bootstrap

    35 +	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);

    36  

    37  RAW_CXX_TARGET_EXPORTS = \

    38  	$(BASE_TARGET_EXPORTS) \
crosstool-ng