libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

2003-07-06 H.J. Lu <hongjiu.lu@intel.com> 

* config-ml.in: Replace PWD with PWD_COMMAND.
	* Makefile.tpl: Likewise.
	* Makefile.in: Regenerated.
This commit is contained in:
H.J. Lu 2003-07-06 21:38:00 +00:00
parent 0d043e9aac
commit 5230d454ea
4 changed files with 2168 additions and 2158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-06 H.J. Lu <hongjiu.lu@intel.com>
* config-ml.in: Replace PWD with PWD_COMMAND.
* Makefile.tpl: Likewise.
* Makefile.in: Regenerated.
2003-06-27 Nathanael Nerode <neroden@gcc.gnu.org> 2003-06-27 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Clean up config-lang.in handling. Delete * configure.in: Clean up config-lang.in handling. Delete

4186
Makefile.in
View File

File diff suppressed because it is too large Load Diff

126
Makefile.tpl
View File

@ -142,7 +142,9 @@ SHELL = @config_shell@
# the environment to account for automounters. The make variable must not # the environment to account for automounters. The make variable must not
# be called PWDCMD, otherwise the value set here is passed to make # be called PWDCMD, otherwise the value set here is passed to make
# subprocesses and overrides the setting from the user's environment. # subprocesses and overrides the setting from the user's environment.
PWD = $${PWDCMD-pwd} # Don't use PWD since it is a common shell environment variable and we
# don't want to corrupt it.
PWD_COMMAND = $${PWDCMD-pwd}
# compilers to use to create programs which must be run in the build # compilers to use to create programs which must be run in the build
# environment. # environment.
@ -534,8 +536,8 @@ maybe-[+make_target+]-gcc:
[+depend+]-gcc [+ [+depend+]-gcc [+
ENDFOR depend +] ENDFOR depend +]
@[ -f ./gcc/Makefile ] || exit 0; \ @[ -f ./gcc/Makefile ] || exit 0; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
for flag in $(EXTRA_GCC_FLAGS); do \ for flag in $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@ -562,8 +564,8 @@ maybe-[+make_target+]-[+module+]:
[+depend+]-[+module+] [+ [+depend+]-[+module+] [+
ENDFOR depend +] ENDFOR depend +]
@[ -f ./[+module+]/Makefile ] || exit 0; \ @[ -f ./[+module+]/Makefile ] || exit 0; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
for flag in $(EXTRA_HOST_FLAGS); do \ for flag in $(EXTRA_HOST_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@ -592,8 +594,8 @@ maybe-[+make_target+]-target-[+module+]:
[+depend+]-target-[+module+] [+ [+depend+]-target-[+module+] [+
ENDFOR depend +] ENDFOR depend +]
@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \ @[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \ echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \
for flag in $(EXTRA_TARGET_FLAGS); do \ for flag in $(EXTRA_TARGET_FLAGS); do \
@ -624,7 +626,7 @@ dvi: do-dvi
do-info: maybe-all-texinfo do-info: maybe-all-texinfo
install-info: do-install-info dir.info install-info: do-install-info dir.info
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if [ -f dir.info ] ; then \ if [ -f dir.info ] ; then \
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
else true ; fi else true ; fi
@ -729,7 +731,7 @@ uninstall:
.PHONY: install.all .PHONY: install.all
install.all: install-no-fixedincludes install.all: install-no-fixedincludes
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}` ; export r ; \ r=`${PWD_COMMAND}` ; export r ; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd ./gcc && \ (cd ./gcc && \
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@ -783,8 +785,8 @@ configure-build-[+module+]:
@test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \ @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
[ -d $(BUILD_SUBDIR)/[+module+] ] || \ [ -d $(BUILD_SUBDIR)/[+module+] ] || \
mkdir $(BUILD_SUBDIR)/[+module+];\ mkdir $(BUILD_SUBDIR)/[+module+];\
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
AR="$(AR_FOR_BUILD)"; export AR; \ AR="$(AR_FOR_BUILD)"; export AR; \
AS="$(AS_FOR_BUILD)"; export AS; \ AS="$(AS_FOR_BUILD)"; export AS; \
CC="$(CC_FOR_BUILD)"; export CC; \ CC="$(CC_FOR_BUILD)"; export CC; \
@ -842,8 +844,8 @@ configure-build-[+module+]:
.PHONY: all-build-[+module+] maybe-all-build-[+module+] .PHONY: all-build-[+module+] maybe-all-build-[+module+]
maybe-all-build-[+module+]: maybe-all-build-[+module+]:
all-build-[+module+]: configure-build-[+module+] all-build-[+module+]: configure-build-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
(cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all) (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all)
[+ ENDFOR build_modules +] [+ ENDFOR build_modules +]
@ -856,8 +858,8 @@ maybe-configure-[+module+]:
configure-[+module+]: configure-[+module+]:
@test ! -f [+module+]/Makefile || exit 0; \ @test ! -f [+module+]/Makefile || exit 0; \
[ -d [+module+] ] || mkdir [+module+]; \ [ -d [+module+] ] || mkdir [+module+]; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
CC="$(CC)"; export CC; \ CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \ CXX="$(CXX)"; export CXX; \
@ -892,8 +894,8 @@ configure-[+module+]:
.PHONY: all-[+module+] maybe-all-[+module+] .PHONY: all-[+module+] maybe-all-[+module+]
maybe-all-[+module+]: maybe-all-[+module+]:
all-[+module+]: configure-[+module+] all-[+module+]: configure-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
@ -908,8 +910,8 @@ check-[+module+]:
# This module is only tested in a native toolchain. # This module is only tested in a native toolchain.
check-[+module+]: check-[+module+]:
@if [ '$(host)' = '$(target)' ] ; then \ @if [ '$(host)' = '$(target)' ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
@ -918,8 +920,8 @@ check-[+module+]:
fi fi
[+ ELSE check +] [+ ELSE check +]
check-[+module+]: check-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
@ -933,8 +935,8 @@ maybe-install-[+module+]:
install-[+module+]: install-[+module+]:
[+ ELSE install +] [+ ELSE install +]
install-[+module+]: installdirs install-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
IF with_x IF with_x
@ -961,8 +963,8 @@ configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
@test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \ @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
[ -d $(TARGET_SUBDIR)/[+module+] ] || \ [ -d $(TARGET_SUBDIR)/[+module+] ] || \
mkdir $(TARGET_SUBDIR)/[+module+];\ mkdir $(TARGET_SUBDIR)/[+module+];\
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
AR="$(AR_FOR_TARGET)"; export AR; \ AR="$(AR_FOR_TARGET)"; export AR; \
AS="$(AS_FOR_TARGET)"; export AS; \ AS="$(AS_FOR_TARGET)"; export AS; \
@ -1027,8 +1029,8 @@ ENDIF raw_cxx +]
.PHONY: all-target-[+module+] maybe-all-target-[+module+] .PHONY: all-target-[+module+] maybe-all-target-[+module+]
maybe-all-target-[+module+]: maybe-all-target-[+module+]:
all-target-[+module+]: configure-target-[+module+] all-target-[+module+]: configure-target-[+module+]
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/[+module+] && \ (cd $(TARGET_SUBDIR)/[+module+] && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+ $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
@ -1044,8 +1046,8 @@ maybe-check-target-[+module+]:
check-target-[+module+]: check-target-[+module+]:
[+ ELSE check +] [+ ELSE check +]
check-target-[+module+]: check-target-[+module+]:
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/[+module+] && \ (cd $(TARGET_SUBDIR)/[+module+] && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+ $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
@ -1062,8 +1064,8 @@ maybe-install-target-[+module+]:
install-target-[+module+]: install-target-[+module+]:
[+ ELSE install +] [+ ELSE install +]
install-target-[+module+]: installdirs install-target-[+module+]: installdirs
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/[+module+] && \ (cd $(TARGET_SUBDIR)/[+module+] && \
$(MAKE) $(TARGET_FLAGS_TO_PASS) install) $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@ -1084,8 +1086,8 @@ maybe-configure-gcc:
configure-gcc: configure-gcc:
@test ! -f gcc/Makefile || exit 0; \ @test ! -f gcc/Makefile || exit 0; \
[ -d gcc ] || mkdir gcc; \ [ -d gcc ] || mkdir gcc; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
CC="$(CC)"; export CC; \ CC="$(CC)"; export CC; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \
CXX="$(CXX)"; export CXX; \ CXX="$(CXX)"; export CXX; \
@ -1125,13 +1127,13 @@ configure-gcc:
maybe-all-gcc: maybe-all-gcc:
all-gcc: configure-gcc all-gcc: configure-gcc
@if [ -f gcc/stage_last ] ; then \ @if [ -f gcc/stage_last ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
else \ else \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
fi fi
@ -1149,13 +1151,13 @@ all-gcc: configure-gcc
GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
.PHONY: $(GCC_STRAP_TARGETS) .PHONY: $(GCC_STRAP_TARGETS)
$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Bootstrapping the compiler"; \ echo "Bootstrapping the compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
case "$@" in \ case "$@" in \
*bootstrap4-lean ) \ *bootstrap4-lean ) \
msg="Comparing stage3 and stage4 of the compiler"; \ msg="Comparing stage3 and stage4 of the compiler"; \
@ -1173,38 +1175,38 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "$$msg"; \ echo "$$msg"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building runtime libraries"; \ echo "Building runtime libraries"; \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
profiledbootstrap: all-bootstrap configure-gcc profiledbootstrap: all-bootstrap configure-gcc
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Bootstrapping the compiler"; \ echo "Bootstrapping the compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building runtime libraries and training compiler"; \ echo "Building runtime libraries and training compiler"; \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building feedback based compiler"; \ echo "Building feedback based compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
.PHONY: cross .PHONY: cross
cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building the C and C++ compiler"; \ echo "Building the C and C++ compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
echo "Building runtime libraries"; \ echo "Building runtime libraries"; \
$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \ $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
@ -1214,8 +1216,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
maybe-check-gcc: maybe-check-gcc:
check-gcc: check-gcc:
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
else \ else \
@ -1225,8 +1227,8 @@ check-gcc:
.PHONY: check-gcc-c++ .PHONY: check-gcc-c++
check-gcc-c++: check-gcc-c++:
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
else \ else \
@ -1241,8 +1243,8 @@ check-c++:
maybe-install-gcc: maybe-install-gcc:
install-gcc: install-gcc:
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ] ; then \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
else \ else \
@ -1261,8 +1263,8 @@ gcc-no-fixedincludes:
cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \ cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
touch gcc/stmp-fixinc gcc/include/fixed; \ touch gcc/stmp-fixinc gcc/include/fixed; \
rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \ rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
r=`${PWD}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
(cd ./gcc && \ (cd ./gcc && \
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
@ -1406,7 +1408,7 @@ configure-target-qthreads: $(ALL_GCC_C)
# We use move-if-change so that it's only considered updated when it # We use move-if-change so that it's only considered updated when it
# actually changes, because it has to depend on a phony target. # actually changes, because it has to depend on a phony target.
multilib.out: maybe-all-gcc multilib.out: maybe-all-gcc
@r=`${PWD}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
echo "Checking multilib configuration..."; \ echo "Checking multilib configuration..."; \
$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \ $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \ $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \

8
config-ml.in
View File

@ -500,7 +500,7 @@ multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ]
cat > Multi.tem <<\EOF cat > Multi.tem <<\EOF
PWD=$${PWDCMD-pwd} PWD_COMMAND=$${PWDCMD-pwd}
# FIXME: There should be an @-sign in front of the `if'. # FIXME: There should be an @-sign in front of the `if'.
# Leave out until this is tested a bit more. # Leave out until this is tested a bit more.
@ -508,8 +508,8 @@ multi-do:
if [ -z "$(MULTIDIRS)" ]; then \ if [ -z "$(MULTIDIRS)" ]; then \
true; \ true; \
else \ else \
rootpre=`${PWD}`/; export rootpre; \ rootpre=`${PWD_COMMAND}`/; export rootpre; \
srcrootpre=`cd $(srcdir); ${PWD}`/; export srcrootpre; \ srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \ lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
compiler="$(CC)"; \ compiler="$(CC)"; \
for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \ for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
@ -546,7 +546,7 @@ multi-clean:
if [ -z "$(MULTIDIRS)" ]; then \ if [ -z "$(MULTIDIRS)" ]; then \
true; \ true; \
else \ else \
lib=`${PWD} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \ lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
for dir in Makefile $(MULTIDIRS); do \ for dir in Makefile $(MULTIDIRS); do \
if [ -f ../$${dir}/$${lib}/Makefile ]; then \ if [ -f ../$${dir}/$${lib}/Makefile ]; then \
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \ if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \