patches/gcc/4.4.1/370-bootstrap-target_lib_path.patch
author Remy Bohmer <linux@bohmer.net>
Sun Jul 11 22:23:34 2010 +0200 (2010-07-11)
changeset 2021 3e52a1510f87
permissions -rw-r--r--
debug/gdb: Fix compilation for Mingw hosts

GDB requires PDcurses instead of ncurses while running on Windows.
So, do not always compile ncurses in case GDB needs to build.

PDcurses is provided by an earlier build step and is not described in
this file.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
[yann.morin.1998@anciense.nib.fr: we already have a way to detect ncurses usage]
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) \