Skip to content

R
riscv-gcc-1
Commit c9db9354 by Paolo Bonzini Committed by Paolo Bonzini
Options

* Makefile.in: Regenerate to fix conflict between the previous two patches. 

From-SVN: r95683
parent 9c6a7ecc
Showing with 29 additions and 26 deletions
ChangeLog
2005-02-28 Paolo Bonzini <bonzini@gnu.org> 2005-02-28 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate to fix conflict between the previous two
patches.
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383 PR bootstrap/17383
* Makefile.def (target_modules): Remove "stage", now unnecessary. * Makefile.def (target_modules): Remove "stage", now unnecessary.
* Makefile.tpl (HOST_SUBDIR): New substitution. * Makefile.tpl (HOST_SUBDIR): New substitution.
......
Makefile.in
...@@ -23945,24 +23945,20 @@ maybe-configure-gnattools: ...@@ -23945,24 +23945,20 @@ maybe-configure-gnattools:
@if gnattools @if gnattools
maybe-configure-gnattools: configure-gnattools maybe-configure-gnattools: configure-gnattools
configure-gnattools: configure-gnattools:
@test ! -f gnattools/Makefile || exit 0; \ @test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
[ -d gnattools ] || mkdir gnattools; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
echo Configuring in gnattools; \ echo Configuring in gnattools; \
cd gnattools || exit 1; \ cd $(HOST_SUBDIR)/gnattools || exit 1; \
case $(srcdir) in \ case $(srcdir) in \
\.) \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
srcdiroption="--srcdir=."; \ *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
libsrcdir=".";; \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
/* | [A-Za-z]:[\\/]*) \
srcdiroption="--srcdir=$(srcdir)/gnattools"; \
libsrcdir="$$s/gnattools";; \
*) \
srcdiroption="--srcdir=../$(srcdir)/gnattools"; \
libsrcdir="$$s/gnattools";; \
esac; \ esac; \
srcdiroption="--srcdir=$${topdir}/gnattools"; \
libsrcdir="$$s/gnattools"; \
$(SHELL) $${libsrcdir}/configure \ $(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \ $(HOST_CONFIGARGS) $${srcdiroption} \
|| exit 1 || exit 1
...@@ -23978,8 +23974,8 @@ all-gnattools: configure-gnattools ...@@ -23978,8 +23974,8 @@ all-gnattools: configure-gnattools
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
(cd gnattools && $(MAKE) $(FLAGS_TO_PASS) \ (cd $(HOST_SUBDIR)/gnattools && \
$(TARGET-gnattools)) $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnattools))
@endif gnattools @endif gnattools
.PHONY: check-gnattools maybe-check-gnattools .PHONY: check-gnattools maybe-check-gnattools
...@@ -23992,7 +23988,8 @@ check-gnattools: ...@@ -23992,7 +23988,8 @@ check-gnattools:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
(cd gnattools && $(MAKE) $(FLAGS_TO_PASS) check) (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(FLAGS_TO_PASS) check)
@endif gnattools @endif gnattools
...@@ -24006,7 +24003,8 @@ install-gnattools: installdirs ...@@ -24006,7 +24003,8 @@ install-gnattools: installdirs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(SET_LIB_PATH) \ $(SET_LIB_PATH) \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
(cd gnattools && $(MAKE) $(FLAGS_TO_PASS) install) (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(FLAGS_TO_PASS) check)
@endif gnattools @endif gnattools
...@@ -24028,7 +24026,7 @@ info-gnattools: \ ...@@ -24028,7 +24026,7 @@ info-gnattools: \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing info in gnattools" ; \ echo "Doing info in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24054,7 +24052,7 @@ dvi-gnattools: \ ...@@ -24054,7 +24052,7 @@ dvi-gnattools: \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing dvi in gnattools" ; \ echo "Doing dvi in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24080,7 +24078,7 @@ html-gnattools: \ ...@@ -24080,7 +24078,7 @@ html-gnattools: \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing html in gnattools" ; \ echo "Doing html in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24106,7 +24104,7 @@ TAGS-gnattools: \ ...@@ -24106,7 +24104,7 @@ TAGS-gnattools: \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing TAGS in gnattools" ; \ echo "Doing TAGS in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24133,7 +24131,7 @@ install-info-gnattools: \ ...@@ -24133,7 +24131,7 @@ install-info-gnattools: \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing install-info in gnattools" ; \ echo "Doing install-info in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24159,7 +24157,7 @@ installcheck-gnattools: \ ...@@ -24159,7 +24157,7 @@ installcheck-gnattools: \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing installcheck in gnattools" ; \ echo "Doing installcheck in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24184,7 +24182,7 @@ mostlyclean-gnattools: ...@@ -24184,7 +24182,7 @@ mostlyclean-gnattools:
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing mostlyclean in gnattools" ; \ echo "Doing mostlyclean in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24209,7 +24207,7 @@ clean-gnattools: ...@@ -24209,7 +24207,7 @@ clean-gnattools:
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing clean in gnattools" ; \ echo "Doing clean in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24234,7 +24232,7 @@ distclean-gnattools: ...@@ -24234,7 +24232,7 @@ distclean-gnattools:
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing distclean in gnattools" ; \ echo "Doing distclean in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
...@@ -24259,7 +24257,7 @@ maintainer-clean-gnattools: ...@@ -24259,7 +24257,7 @@ maintainer-clean-gnattools:
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing maintainer-clean in gnattools" ; \ echo "Doing maintainer-clean in gnattools" ; \
(cd gnattools && \ (cd $(HOST_SUBDIR)/gnattools && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \ "RANLIB=$${RANLIB}" \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment