diff options
| author | cvs2svn <> | 2004-01-19 18:29:03 +0000 |
|---|---|---|
| committer | cvs2svn <> | 2004-01-19 18:29:03 +0000 |
| commit | fe9afc452c060ca8c184c9cf6c29b620548c3083 (patch) | |
| tree | cf6c79ccd5ad484c1452fbc32450f7ac59ad75e7 /Makefile.tpl | |
| parent | 19a58aa1e1b6710a4fe969ea55492f5fb7a0771d (diff) | |
| download | cygnal-drow-cplus-merge-20031220.tar.gz cygnal-drow-cplus-merge-20031220.tar.bz2 cygnal-drow-cplus-merge-20031220.zip | |
This commit was manufactured by cvs2svn to create tag 'drow-cplus-drow-cplus-merge-20031220
merge-20031220'.
Sprout from cagney_bigcore-20040122-branch 2004-01-19 18:28:59 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2003-12-19 16:50:48 UTC DJ Delorie <dj@redhat.com> 'merge from gcc':
ChangeLog
Makefile.def
Makefile.in
Makefile.tpl
config-ml.in
config/ChangeLog
config/acinclude.m4
configure
configure.in
gettext.m4
include/ChangeLog
include/aout/ChangeLog
include/aout/stab.def
include/coff/ChangeLog
include/demangle.h
include/elf/ChangeLog
include/elf/common.h
include/elf/frv.h
include/opcode/ChangeLog
include/opcode/h8300.h
src-release
Delete:
include/ChangeLog-9103
include/coff/ChangeLog-9103
include/elf/ChangeLog-9103
include/opcode/ChangeLog-9103
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index c82c81830..3b545c460 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -983,7 +983,7 @@ ENDIF raw_cxx +] .) topdir="../$(srcdir)" ;; \ *) topdir="../../$(srcdir)" ;; \ esac ;; \ - esac; \[+ IF stage +] + esac; \ if [ "$(srcdir)" = "." ] ; then \ if [ "$(TARGET_SUBDIR)" != "." ] ; then \ if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ @@ -1004,10 +1004,10 @@ ENDIF raw_cxx +] 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} \ @@ -1069,9 +1069,6 @@ install-target-[+module+]: installdirs # build modules. So GCC is a sort of hybrid. # gcc is the only module which uses GCC_FLAGS_TO_PASS. -# Don't use shared host config.cache, as it will confuse later -# directories; GCC wants slightly different values for some -# precious variables. *sigh* .PHONY: configure-gcc maybe-configure-gcc maybe-configure-gcc: configure-gcc: |