Updated to supres bad effect of localized GCC -print-search-dirs output

[orte.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 74bedb0f36c025a45fc342a9e1149fdd90313e9e..34ea689588c970c86d17b83ee14d83f0662537eb 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -370,7 +370,7 @@ ifeq ($(CONFIG_RTLINUX),y)
 include $(RTL_DIR)/rtl.mk
 
 KERN_CC = $(CC)
-kern_GCCLIB_DIR=$(shell $(CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )
+kern_GCCLIB_DIR=$(shell LANG=C LC_ALL=C LC_MESSAGES=C $(CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )
 INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES)
 #-DEXPORT_NO_SYMBOLS
 c_o_kern_COMPILE = $(KERN_CC) -idirafter $(kern_GCCLIB_DIR)/include $(INCLUDES)  $(CFLAGS) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
@@ -391,7 +391,7 @@ kernel_INCLUDES += -idirafter $(LINUX_SRC)/include/linux
 
 ifdef LINUX_CC
 KERN_CC = $(LINUX_CC)
-kern_GCCLIB_DIR=$(shell $(LINUX_CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )
+kern_GCCLIB_DIR=$(shell LANG=C LC_ALL=C LC_MESSAGES=C $(LINUX_CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )
 else
 KERN_CC = echo KERN_CC not defined - compilation skipped
 endif
@@ -639,7 +639,8 @@ library-pass binary-pass utils-pass:
                if [ "$@" != "binary-pass" ] ; then exit 0 ; fi ; \
                if [ ! -e $(SOURCES_DIR)/$(dir)/Makefile ] ; then  \
                ( cd $(SOURCES_DIR)/$(dir) ; $$QTDIR/bin/qmake TOP_DIR=$(MAKERULES_DIR) \
-                    RELATIVE_DIR=$(RELATIVE_DIR)/$(dir) || exit 1 ;) ; fi ; \
+                    RELATIVE_DIR=$(RELATIVE_DIR)/$(dir) QTDIR=$(QTDIR) CC=$(CC) \
+                    CXX=$(CXX) || exit 1 ;) ; fi ; \
                $(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(dir) \
                RELATIVE_DIR=$(RELATIVE_DIR)/$(dir) -C $(SOURCES_DIR)/$(dir) \
                -f $(SOURCES_DIR)/$(dir)/Makefile || exit 1 ;)