diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 65b9cc0..b56ccb6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -220,6 +220,7 @@ FLAGS_FOR_TARGET = CC_FOR_TARGET = CHILL_FOR_TARGET = CXX_FOR_TARGET = +CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = # If GCC_FOR_TARGET is not overriden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to @@ -385,6 +386,14 @@ BASE_FLAGS_TO_PASS = \ "target_alias=$(target_alias)" \ "libsubdir=$(libsubdir)" +# For any flags above that may contain shell code that varies from one +# target library to another. When doing recursive invocations of the +# top-level Makefile, we don't want the outer make to evaluate them, +# so we pass these variables down unchanged. They must not contain +# single nor double quotes. +RECURSE_FLAGS = \ + CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' + # Flags to pass down to most sub-makes, in which we're building with # the host environment. # If any variables are added here, they must be added to do-*, below. @@ -1349,7 +1358,8 @@ $(ALL_TARGET_MODULES): r=`pwd`; export r; \ s=`cd $(srcdir); pwd`; export s; \ $(SET_LIB_PATH) \ - (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \ + (cd $(TARGET_SUBDIR)/$${dir}; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \ else \ true; \ fi @@ -1363,7 +1373,8 @@ $(CHECK_TARGET_MODULES): r=`pwd`; export r; \ s=`cd $(srcdir); pwd`; export s; \ $(SET_LIB_PATH) \ - (cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\ + (cd $(TARGET_SUBDIR)/$${dir}; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) check);\ else \ true; \ fi @@ -1478,7 +1489,7 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b s=`cd $(srcdir); pwd` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) all + $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all .PHONY: cross cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld @@ -1491,7 +1502,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld s=`cd $(srcdir); pwd` ; export s; \ $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) all LANGUAGES="c c++" + $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ + LANGUAGES="c c++" all .PHONY: check-gcc check-gcc: |