OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR bootstrap/17383 (Building in src dir fails)

Browse Source 
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.

From-SVN: r92674
This commit is contained in:
Paolo Bonzini 2004-12-28 17:40:40 +00:00 committed by Paolo Bonzini
parent 7afe555c33
commit 3224a22f10
4 changed files with 642 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
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.
2004-12-25 David Edelsohn <edelsohn@gnu.org> 2004-12-25 David Edelsohn <edelsohn@gnu.org>
Revert 2004-12-08 Makefile changes. Revert 2004-12-08 Makefile changes.

4
Makefile.def
View File

@ -117,7 +117,7 @@ target_modules = { module= libmudflap; };
target_modules = { module= newlib; }; target_modules = { module= newlib; };
target_modules = { module= libgfortran; }; target_modules = { module= libgfortran; };
target_modules = { module= libobjc; }; target_modules = { module= libobjc; };
target_modules = { module= libtermcap; no_check=true; stage=true; target_modules = { module= libtermcap; no_check=true;
missing=mostlyclean; missing=mostlyclean;
missing=clean; missing=clean;
missing=distclean; missing=distclean;
@ -129,7 +129,7 @@ target_modules = { module= gperf; };
target_modules = { module= examples; no_check=true; no_install=true; }; target_modules = { module= examples; no_check=true; no_install=true; };
target_modules = { module= libffi; }; target_modules = { module= libffi; };
target_modules = { module= libjava; raw_cxx=true; }; target_modules = { module= libjava; raw_cxx=true; };
target_modules = { module= zlib; stage=true; }; target_modules = { module= zlib; };
target_modules = { module= boehm-gc; }; target_modules = { module= boehm-gc; };
target_modules = { module= qthreads; }; target_modules = { module= qthreads; };
target_modules = { module= rda; }; target_modules = { module= rda; };

857
Makefile.in
View File

File diff suppressed because it is too large Load Diff

74
Makefile.tpl
View File

@ -822,31 +822,30 @@ configure-build-[+module+]:
echo Configuring in $(BUILD_SUBDIR)/[+module+]; \ echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \ cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
case $(srcdir) in \ case $(srcdir) in \
/* | [A-Za-z]:[\\/]*) \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
topdir=$(srcdir) ;; \ *) topdir="../../$(srcdir)" ;; \
*) \
case "$(BUILD_SUBDIR)" in \
.) topdir="../$(srcdir)" ;; \
*) topdir="../../$(srcdir)" ;; \
esac ;; \
esac; \ esac; \
if [ "$(srcdir)" = "." ] ; then \ if [ "$(srcdir)" = "." ] ; then \
if [ "$(BUILD_SUBDIR)" != "." ] ; then \ if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ if [ -f Makefile ]; then \
if [ -f Makefile ]; then \ if $(MAKE) distclean; then \
if $(MAKE) distclean; then \
true; \
else \
exit 1; \
fi; \
else \
true; \ true; \
else \
exit 1; \
fi; \ fi; \
else \ else \
exit 1; \ true; \
fi; \ fi; \
else \ else \
exit 1; \
fi; \
if [ -d ../include ] ; then \
true; \ true; \
else \
mkdir ../include; \
cd ../include; \
$(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \
cd ../[+module+]; \
fi; \ fi; \
srcdiroption="--srcdir=."; \ srcdiroption="--srcdir=."; \
libsrcdir="."; \ libsrcdir="."; \
@ -1032,38 +1031,37 @@ ENDIF raw_cxx +]
echo Configuring in $(TARGET_SUBDIR)/[+module+]; \ echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \ cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
case $(srcdir) in \ case $(srcdir) in \
/* | [A-Za-z]:[\\/]*) \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
topdir=$(srcdir) ;; \ *) topdir="../../$(srcdir)" ;; \
*) \ esac; \
case "$(TARGET_SUBDIR)" in \
.) topdir="../$(srcdir)" ;; \
*) topdir="../../$(srcdir)" ;; \
esac ;; \
esac; \[+ IF stage +]
if [ "$(srcdir)" = "." ] ; then \ if [ "$(srcdir)" = "." ] ; then \
if [ "$(TARGET_SUBDIR)" != "." ] ; then \ if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ if [ -f Makefile ]; then \
if [ -f Makefile ]; then \ if $(MAKE) distclean; then \
if $(MAKE) distclean; then \
true; \
else \
exit 1; \
fi; \
else \
true; \ true; \
else \
exit 1; \
fi; \ fi; \
else \ else \
exit 1; \ true; \
fi; \ fi; \
else \ else \
exit 1; \
fi; \
if [ -d ../include ] ; then \
true; \ true; \
else \
mkdir ../include; \
cd ../include; \
$(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \
cd ../[+module+]; \
fi; \ fi; \
srcdiroption="--srcdir=."; \ srcdiroption="--srcdir=."; \
libsrcdir="."; \ libsrcdir="."; \
else \[+ ENDIF stage +] else \
srcdiroption="--srcdir=$${topdir}/[+module+]"; \ srcdiroption="--srcdir=$${topdir}/[+module+]"; \
libsrcdir="$$s/[+module+]"; \[+ IF stage +] libsrcdir="$$s/[+module+]"; \
fi; \[+ ENDIF stage +] fi; \
rm -f no-such-file || : ; \ rm -f no-such-file || : ; \
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) $${srcdiroption} \ $(TARGET_CONFIGARGS) $${srcdiroption} \