Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.3/370-bootstrap-target_lib_path.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 1698 9c8f68607d75
permissions -rw-r--r--
cc/gcc: cleanup the _or_later logic

So far, we've had a version always select appropriate _or_later option,
which in turn would select all previous _or_later options.

Because the dependencies on companion libs were cumulative, that was
working OK. But the upcoming 4.6 will no longer depend on libelf, so
we can't keep the cumulative scheme we've been using so far.

Have each release family select the corresponding dependencies, instead
of relying on selecting previous _or_later.

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 --git a/Makefile.in b/Makefile.in

    10 index e5fa1d3..dbfc1f0 100644

    11 --- a/Makefile.in

    12 +++ b/Makefile.in

    13 @@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \

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

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

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

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

    18 +@if gcc-bootstrap

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

    20 +@endif gcc-bootstrap

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

    22  

    23  RAW_CXX_TARGET_EXPORTS = \

    24  	$(BASE_TARGET_EXPORTS) \

    25 diff --git a/Makefile.tpl b/Makefile.tpl

    26 index 15102e5..452d47c 100644

    27 --- a/Makefile.tpl

    28 +++ b/Makefile.tpl

    29 @@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \

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

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

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

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

    34 +@if gcc-bootstrap

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

    36 +@endif gcc-bootstrap

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

    38  

    39  RAW_CXX_TARGET_EXPORTS = \

    40  	$(BASE_TARGET_EXPORTS) \
crosstool-ng