Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.1/370-bootstrap-target_lib_path.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.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