diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2015-06-24 21:43:02 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2015-06-24 21:43:02 +0200 |
| commit | f91ca6bc00c1e3c70c1d2f4527d4297b76e2eaca (patch) | |
| tree | 2cf0506c54b3ed4693dc47cb502088ed5c27a09f /Makefile.tpl | |
| parent | 59cab532835904f368b0aa99267afba5fda5ded2 (diff) | |
Sync libiberty from GCC, replaying updates to configure scripts
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 f737cfca6c..5d2cea230b 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+] |