Ticket #10388: 999-Makefile.patch

File 999-Makefile.patch, 2.2 KB (added by joel_ejc@…, 5 years ago)

RPATH_ENVVAR patch for gcc 4.4.2

  • Makefile.in

    a b EXTRA_BUILD_FLAGS = \ 
    156156        CFLAGS="$(CFLAGS_FOR_BUILD)" \ 
    157157        LDFLAGS="$(LDFLAGS_FOR_BUILD)" 
    158158 
    159 # This is the list of directories to built for the host system. 
     159# This is the list of directories to built for the target system. 
    160160SUBDIRS = @configdirs@ 
    161161# This is set by the configure script to the arguments to use when configuring 
    162162# directories built for the host system. 
    BASE_TARGET_EXPORTS = \ 
    245245        STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ 
    246246        WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ 
    247247        WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ 
    248         $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); 
     248@if gcc-bootstrap 
     249        $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ 
     250@endif gcc-bootstrap 
     251        $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); 
    249252 
    250253RAW_CXX_TARGET_EXPORTS = \ 
    251254        $(BASE_TARGET_EXPORTS) \ 
  • Makefile.tpl

    a b TARGET_SUBDIR = @target_subdir@ 
    226226# directories built for the target. 
    227227TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" 
    228228# This is the list of variables to export in the environment when 
    229 # configuring subdirectories for the host system. 
     229# configuring subdirectories for the target system. 
    230230BASE_TARGET_EXPORTS = \ 
    231231        $(BASE_EXPORTS) \ 
    232232        AR="$(AR_FOR_TARGET)"; export AR; \ 
    BASE_TARGET_EXPORTS = \ 
    248248        STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ 
    249249        WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ 
    250250        WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ 
    251         $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); 
     251@if gcc-bootstrap 
     252        $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ 
     253@endif gcc-bootstrap 
     254        $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); 
    252255 
    253256RAW_CXX_TARGET_EXPORTS = \ 
    254257        $(BASE_TARGET_EXPORTS) \