diff options
| author | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-28 17:40:40 +0000 |
|---|---|---|
| committer | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-28 17:40:40 +0000 |
| commit | 1fe422382597368124aae13372ed05e409265bfa (patch) | |
| tree | c18c3d24a09b2fae159cccf7255357f6946506ca /Makefile.tpl | |
| parent | 5dd27f048adcf2afc7f718a9dcca67c2d67cff59 (diff) | |
| download | gcc-1fe422382597368124aae13372ed05e409265bfa.tar.gz | |
2004-12-28 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.def (target_modules): Remove stage parameter,
it is always true now.
* Makefile.tpl (configure-build-[+module+],
configure-target-[+module+]): Always build symlink tree
for the directory and for include. BUILD_SUBDIR and
TARGET_SUBDIR cannot be . anymore.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92674 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 74 |
1 files changed, 36 insertions, 38 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 44c15fd53cc..d85d0902f76 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -822,31 +822,30 @@ configure-build-[+module+]: echo Configuring in $(BUILD_SUBDIR)/[+module+]; \ cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../[+module+]; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -1032,38 +1031,37 @@ ENDIF raw_cxx +] echo Configuring in $(TARGET_SUBDIR)/[+module+]; \ cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ - esac; \[+ IF stage +] + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../[+module+]; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ - else \[+ ENDIF stage +] + else \ srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \[+ IF stage +] - fi; \[+ ENDIF stage +] + libsrcdir="$$s/[+module+]"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ |