diff options
| author | Max Ostapenko <m.ostapenko@partner.samsung.com> | 2015-04-14 19:14:04 +0300 |
|---|---|---|
| committer | Maxim Ostapenko <chefmax@gcc.gnu.org> | 2015-04-14 19:14:04 +0300 |
| commit | 7701939727594d16b3f41ae07ab11e1f0eec14d3 (patch) | |
| tree | 21311179bea31c0b1be77eeb60904df644863e45 /Makefile.tpl | |
| parent | 5751fb330d8edb4ee61dcf66a19adb98bec5cf37 (diff) | |
| download | gcc-7701939727594d16b3f41ae07ab11e1f0eec14d3.tar.gz | |
Makefile.tpl (EXTRA_HOST_EXPORTS): New variables.
2015-04-14 Max Ostapenko <m.ostapenko@partner.samsung.com>
* Makefile.tpl (EXTRA_HOST_EXPORTS): New variables.
(EXTRA_BOOTSTRAP_FLAGS): Likewise.
(check-[+module+]): Add EXTRA_HOST_EXPORTS and EXTRA_BOOTSTRAP_FLAGS.
* Makefile.in: Regenerate.
libiberty/
* testsuite/Makefile.in (LIBCFLAGS): Add LDFLAGS.
From-SVN: r222099
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 1ea19549eba..6991a736e43 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -634,6 +634,14 @@ POSTSTAGE1_FLAGS_TO_PASS = \ $(LTO_FLAGS_TO_PASS) \ "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" +@if gcc-bootstrap +EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \ + $(POSTSTAGE1_HOST_EXPORTS) \ + fi ; + +EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS" +@endif gcc-bootstrap + # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -1203,18 +1211,22 @@ check-[+module+]: @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) [+ IF bootstrap +]$(EXTRA_HOST_EXPORTS)[+ + ENDIF bootstrap +] \ (cd $(HOST_SUBDIR)/[+module+] && \ - $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check); \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+][+ + IF bootstrap +] $(EXTRA_BOOTSTRAP_FLAGS)[+ ENDIF bootstrap +] check) fi [+ ELSE check +] check-[+module+]: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) [+ IF bootstrap +]$(EXTRA_HOST_EXPORTS)[+ + ENDIF bootstrap +] \ (cd $(HOST_SUBDIR)/[+module+] && \ - $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check) + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+][+ + IF bootstrap +] $(EXTRA_BOOTSTRAP_FLAGS)[+ ENDIF bootstrap +] check) [+ ENDIF no_check +] @endif [+module+] |