Makefile.def (bfd, [...]): Set lib_path.
2005-03-31 Paolo Bonzini <bonzini@gnu.org> * Makefile.def (bfd, opcodes, libstdc++-v3, libmudflap): Set lib_path. * Makefile.tpl (SET_LIB_PATH, REALLY_SET_LIB_PATH): Remove. (HOST_EXPORTS, STAGE_HOST_EXPORTS, TARGET_EXPORTS): Set $(RPATH_ENVVAR). (HOST_LIB_PATH): Generate from Makefile.def. (TARGET_LIB_PATH): Likewise. (Old bootstrap targets): Include TARGET_LIB_PATH into RPATH_ENVVAR. * Makefile.in: Regenerate. * configure.in (set_lib_path, SET_LIB_PATH, SET_GCC_LIB_PATH): Remove. (RPATH_ENVVAR): Include Darwin case. * configure: Regenerate. config: 2005-03-31 Paolo Bonzini <bonzini@gnu.org> * config/gcc-lib-path.m4: Remove. gcc: 2005-03-31 Paolo Bonzini <bonzini@gnu.org> * gcc/aclocal.m4: Do not include config/gcc-lib-path.m4. * gcc/Makefile.in: Do not @set_gcc_lib_path@. * gcc/configure.ac (TL_AC_GNU_MAKE_GCC_LIB_PATH): Remove. * gcc/configure: Regenerate. From-SVN: r97249
This commit is contained in:
Paolo Bonzini
Paolo Bonzini
parent
c3a2edb6ca
commit
0bff65e72f
|
|
@ -37,8 +37,8 @@ host_modules= { module= ash; };
|
|||
host_modules= { module= autoconf; };
|
||||
host_modules= { module= automake; };
|
||||
host_modules= { module= bash; };
|
||||
host_modules= { module= bfd; bootstrap=true; };
|
||||
host_modules= { module= opcodes; bootstrap=true; };
|
||||
host_modules= { module= bfd; lib_path=.; bootstrap=true; };
|
||||
host_modules= { module= opcodes; lib_path=.; bootstrap=true; };
|
||||
host_modules= { module= binutils; bootstrap=true; };
|
||||
host_modules= { module= bison; no_check_cross= true; };
|
||||
host_modules= { module= byacc; no_check_cross= true; };
|
||||
|
|
@ -113,8 +113,8 @@ host_modules= { module= libtermcap; no_check=true;
|
|||
host_modules= { module= utils; no_check=true; };
|
||||
host_modules= { module= gnattools; };
|
||||
|
||||
target_modules = { module= libstdc++-v3; raw_cxx=true; };
|
||||
target_modules = { module= libmudflap; };
|
||||
target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; };
|
||||
target_modules = { module= libmudflap; lib_path=.libs; };
|
||||
target_modules = { module= newlib; };
|
||||
target_modules = { module= libgfortran; };
|
||||
target_modules = { module= libobjc; };
|
||||
|
|
|
|||
1173
Makefile.in
1173
Makefile.in
File diff suppressed because it is too large
Load Diff
93
Makefile.tpl
93
Makefile.tpl
|
|
@ -87,17 +87,6 @@ GDB_NLM_DEPS =
|
|||
# the libraries.
|
||||
RPATH_ENVVAR = @RPATH_ENVVAR@
|
||||
|
||||
# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
|
||||
# was used.
|
||||
SET_LIB_PATH = @SET_LIB_PATH@
|
||||
|
||||
# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
|
||||
# Some platforms don't like blank entries, so we remove duplicate,
|
||||
# leading and trailing colons.
|
||||
REALLY_SET_LIB_PATH = \
|
||||
@SET_GCC_LIB_PATH@ \
|
||||
$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
||||
|
||||
# This is the list of directories to be built for the build system.
|
||||
BUILD_CONFIGDIRS = libiberty
|
||||
# Build programs are put under this directory.
|
||||
|
|
@ -169,11 +158,11 @@ HOST_EXPORTS = \
|
|||
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
||||
GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
|
||||
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
|
||||
SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
|
||||
@SET_GCC_LIB_PATH@
|
||||
$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
||||
|
||||
# Similar, for later GCC stages.
|
||||
STAGE_HOST_EXPORTS = \
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
$(HOST_EXPORTS) \
|
||||
CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
|
||||
-B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
|
||||
|
|
@ -209,8 +198,7 @@ BASE_TARGET_EXPORTS = \
|
|||
NM="$(NM_FOR_TARGET)"; export NM; \
|
||||
RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
|
||||
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
|
||||
SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
|
||||
@SET_GCC_LIB_PATH@
|
||||
$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
|
||||
|
||||
RAW_CXX_TARGET_EXPORTS = \
|
||||
$(BASE_TARGET_EXPORTS) \
|
||||
|
|
@ -316,10 +304,6 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
|
|||
# Programs producing files for the HOST machine
|
||||
# ---------------------------------------------
|
||||
|
||||
# This is the list of directories that may be needed in RPATH_ENVVAR
|
||||
# so that programs built for the host machine work.
|
||||
HOST_LIB_PATH = $$r/$(HOST_SUBDIR)/bfd:$$r/$(HOST_SUBDIR)/opcodes
|
||||
|
||||
AS = @AS@
|
||||
|
||||
AR = @AR@
|
||||
|
|
@ -350,10 +334,6 @@ PICFLAG =
|
|||
# Programs producing files for the TARGET machine
|
||||
# -----------------------------------------------
|
||||
|
||||
# This is the list of directories that may be needed in RPATH_ENVVAR
|
||||
# so that prorgams built for the target machine work.
|
||||
TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libmudflap/.libs
|
||||
|
||||
FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
|
||||
|
||||
AR_FOR_TARGET=@AR_FOR_TARGET@
|
||||
|
|
@ -501,6 +481,37 @@ PICFLAG_FOR_TARGET =
|
|||
@host_makefile_frag@
|
||||
###
|
||||
|
||||
# This is the list of directories that may be needed in RPATH_ENVVAR
|
||||
# so that prorgams built for the target machine work.
|
||||
TARGET_LIB_PATH = [+ FOR target_modules +][+
|
||||
IF lib_path +]$(TARGET_LIB_PATH_[+module+])[+ ENDIF lib_path +][+
|
||||
ENDFOR target_modules +]$(HOST_LIB_PATH_gcc)
|
||||
[+ FOR target_modules +][+ IF lib_path +]
|
||||
@if target-[+module+]
|
||||
TARGET_LIB_PATH_[+module+] = $$r/$(TARGET_SUBDIR)/[+module+]/[+lib_path+]:
|
||||
@endif target-[+module+]
|
||||
[+ ENDIF lib_path +][+ ENDFOR target_modules +]
|
||||
|
||||
|
||||
# This is the list of directories that may be needed in RPATH_ENVVAR
|
||||
# so that programs built for the host machine work.
|
||||
HOST_LIB_PATH = [+ FOR host_modules +][+
|
||||
IF lib_path +]$(HOST_LIB_PATH_[+module+])[+ ENDIF lib_path +][+
|
||||
ENDFOR host_modules +]
|
||||
|
||||
# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
|
||||
@if gcc
|
||||
HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc:
|
||||
@endif gcc
|
||||
|
||||
[+ FOR host_modules +][+ IF lib_path +]
|
||||
@if [+module+]
|
||||
HOST_LIB_PATH_[+module+] = \
|
||||
$$r/$(HOST_SUBDIR)/[+module+]/[+lib_path+]:[+ IF bootstrap
|
||||
+]$$r/$(HOST_SUBDIR)/prev-[+module+]/[+lib_path+]:[+ ENDIF bootstrap +]
|
||||
@endif [+module+]
|
||||
[+ ENDIF lib_path +][+ ENDFOR host_modules +]
|
||||
|
||||
# Flags to pass down to all sub-makes.
|
||||
BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\
|
||||
"[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\
|
||||
|
|
@ -764,7 +775,6 @@ uninstall:
|
|||
install.all: install-no-fixedincludes
|
||||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
r=`${PWD_COMMAND}` ; export r ; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd ./gcc && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
|
||||
|
|
@ -890,7 +900,6 @@ all-[+module+]: configure-[+module+]
|
|||
@[+ IF bootstrap +]test -f stage_last && exit 0; \
|
||||
[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] $(TARGET-[+module+]))
|
||||
|
|
@ -908,7 +917,6 @@ check-[+module+]:
|
|||
@if [ '$(host)' = '$(target)' ] ; then \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check); \
|
||||
|
|
@ -917,7 +925,6 @@ check-[+module+]:
|
|||
check-[+module+]:
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check)
|
||||
|
|
@ -934,7 +941,6 @@ install-[+module+]:
|
|||
install-[+module+]: installdirs
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install)
|
||||
|
|
@ -958,7 +964,6 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
|
|||
@[ -f ./[+module+]/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
for flag in $(EXTRA_HOST_FLAGS) [+extra_make_flags+]; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
|
|
@ -995,8 +1000,7 @@ configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
|
|||
@test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \[+
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
|
||||
IF raw_cxx +]
|
||||
$(RAW_CXX_TARGET_EXPORTS) \[+
|
||||
ELSE normal_cxx +]
|
||||
|
|
@ -1025,8 +1029,7 @@ TARGET-target-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +
|
|||
maybe-all-target-[+module+]: all-target-[+module+]
|
||||
all-target-[+module+]: configure-target-[+module+]
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \[+
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
|
||||
IF raw_cxx +]
|
||||
$(RAW_CXX_TARGET_EXPORTS) \[+
|
||||
ELSE normal_cxx +]
|
||||
|
|
@ -1050,8 +1053,7 @@ check-target-[+module+]:
|
|||
[+ ELSE check +]
|
||||
check-target-[+module+]:
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \[+
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
|
||||
IF raw_cxx +]
|
||||
$(RAW_CXX_TARGET_EXPORTS) \[+
|
||||
ELSE normal_cxx +]
|
||||
|
|
@ -1076,8 +1078,7 @@ install-target-[+module+]:
|
|||
[+ ELSE install +]
|
||||
install-target-[+module+]: installdirs
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \[+
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
|
||||
IF raw_cxx +]
|
||||
$(RAW_CXX_TARGET_EXPORTS) \[+
|
||||
ELSE normal_cxx +]
|
||||
|
|
@ -1104,8 +1105,7 @@ maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
|
|||
ENDFOR depend +]
|
||||
@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \[+
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
|
||||
IF raw_cxx +]
|
||||
$(RAW_CXX_TARGET_EXPORTS) \[+
|
||||
ELSE normal_cxx +]
|
||||
|
|
@ -1141,9 +1141,9 @@ GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstra
|
|||
$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Bootstrapping the compiler"; \
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
|
|
@ -1161,32 +1161,28 @@ $(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
|
|||
msg="Comparing stage2 and stage3 of the compiler"; \
|
||||
compare=compare ;; \
|
||||
esac; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "$$msg"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
||||
|
||||
profiledbootstrap: all-prebootstrap configure-gcc
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
echo "Bootstrapping training compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Building feedback based compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
||||
|
||||
|
|
@ -1194,13 +1190,11 @@ profiledbootstrap: all-prebootstrap configure-gcc
|
|||
cross: all-build all-gas all-ld
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Building the C and C++ compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
|
||||
@endif gcc-no-bootstrap
|
||||
|
|
@ -1211,7 +1205,6 @@ check-gcc-c++:
|
|||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
|
||||
else \
|
||||
|
|
@ -1235,7 +1228,6 @@ gcc-no-fixedincludes:
|
|||
rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd ./gcc && \
|
||||
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \
|
||||
|
|
@ -1491,18 +1483,15 @@ stagefeedback-start::
|
|||
profiledbootstrap:
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Bootstrapping the compiler"; \
|
||||
$(MAKE) stageprofile-bubble distclean-stagefeedback
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
echo "Building runtime libraries and training compiler"; \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
$(HOST_EXPORTS) \
|
||||
echo "Building feedback based compiler"; \
|
||||
$(MAKE) stagefeedback-bubble stagefeedback-end
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2005-03-31 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* config/gcc-lib-path.m4: Remove.
|
||||
|
||||
2005-03-21 Zack Weinberg <zack@codesourcery.com>
|
||||
|
||||
* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
AC_DEFUN([TL_AC_GNU_MAKE_GCC_LIB_PATH],
|
||||
[
|
||||
if test x"$SET_GCC_LIB_PATH_CMD" != x; then
|
||||
# SET_GCC_LIB_PATH_CMD is "XXX=path; export XXX;". It is expanded to
|
||||
#
|
||||
# eval "set_gcc_lib_path=XXX=path; export XXX;"
|
||||
#
|
||||
eval "set_gcc_lib_path=$SET_GCC_LIB_PATH_CMD"
|
||||
# It will set set_gcc_lib_path to "export XXX=path" for GNU make.
|
||||
set_gcc_lib_path="export $set_gcc_lib_path"
|
||||
else
|
||||
set_gcc_lib_path=
|
||||
fi
|
||||
AC_SUBST(set_gcc_lib_path)
|
||||
])dnl
|
||||
|
|
@ -3023,28 +3023,6 @@ case "${host}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
# If no --enable-shared nor --disable-shared is specified, we set up
|
||||
# LD_LIBRARY_PATH when we build for gcc.
|
||||
case $enable_shared in
|
||||
"")
|
||||
if test -d ${srcdir}/gcc; then
|
||||
set_lib_path=yes
|
||||
else
|
||||
set_lib_path=no
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
set_lib_path=$enable_shared
|
||||
;;
|
||||
esac
|
||||
|
||||
# If --enable-shared was set, we must set LD_LIBRARY_PATH so that the
|
||||
# binutils tools will find libbfd.so.
|
||||
case "${set_lib_path}" in
|
||||
no) SET_LIB_PATH= ;;
|
||||
*) SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)" ;;
|
||||
esac
|
||||
|
||||
case "${host}" in
|
||||
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
|
||||
*-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
|
||||
|
|
@ -3527,7 +3505,6 @@ done
|
|||
|
||||
|
||||
|
||||
|
||||
# Build module lists & subconfigure args.
|
||||
|
||||
|
||||
|
|
@ -3554,7 +3531,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|||
# Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3558: checking for $ac_word" >&5
|
||||
echo "configure:3535: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3587,7 +3564,7 @@ if test -z "$ac_cv_prog_AR" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3591: checking for $ac_word" >&5
|
||||
echo "configure:3568: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3626,7 +3603,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3630: checking for $ac_word" >&5
|
||||
echo "configure:3607: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3659,7 +3636,7 @@ if test -z "$ac_cv_prog_AS" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3663: checking for $ac_word" >&5
|
||||
echo "configure:3640: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3698,7 +3675,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3702: checking for $ac_word" >&5
|
||||
echo "configure:3679: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3731,7 +3708,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3735: checking for $ac_word" >&5
|
||||
echo "configure:3712: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3770,7 +3747,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3774: checking for $ac_word" >&5
|
||||
echo "configure:3751: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3803,7 +3780,7 @@ if test -z "$ac_cv_prog_LD" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3807: checking for $ac_word" >&5
|
||||
echo "configure:3784: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3842,7 +3819,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3846: checking for $ac_word" >&5
|
||||
echo "configure:3823: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3875,7 +3852,7 @@ if test -z "$ac_cv_prog_NM" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3879: checking for $ac_word" >&5
|
||||
echo "configure:3856: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3914,7 +3891,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3918: checking for $ac_word" >&5
|
||||
echo "configure:3895: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3947,7 +3924,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3951: checking for $ac_word" >&5
|
||||
echo "configure:3928: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3986,7 +3963,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3990: checking for $ac_word" >&5
|
||||
echo "configure:3967: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4019,7 +3996,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4023: checking for $ac_word" >&5
|
||||
echo "configure:4000: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4058,7 +4035,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4062: checking for $ac_word" >&5
|
||||
echo "configure:4039: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4091,7 +4068,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
|
|||
# Extract the first word of "objcopy", so it can be a program name with args.
|
||||
set dummy objcopy; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4095: checking for $ac_word" >&5
|
||||
echo "configure:4072: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4130,7 +4107,7 @@ fi
|
|||
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
|
||||
set dummy ${ncn_tool_prefix}objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4134: checking for $ac_word" >&5
|
||||
echo "configure:4111: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4163,7 +4140,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
|
|||
# Extract the first word of "objdump", so it can be a program name with args.
|
||||
set dummy objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4167: checking for $ac_word" >&5
|
||||
echo "configure:4144: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4209,7 +4186,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4213: checking for $ac_word" >&5
|
||||
echo "configure:4190: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4242,7 +4219,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4246: checking for $ac_word" >&5
|
||||
echo "configure:4223: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4281,7 +4258,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4285: checking for $ac_word" >&5
|
||||
echo "configure:4262: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4314,7 +4291,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4318: checking for $ac_word" >&5
|
||||
echo "configure:4295: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4353,7 +4330,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4357: checking for $ac_word" >&5
|
||||
echo "configure:4334: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4386,7 +4363,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4390: checking for $ac_word" >&5
|
||||
echo "configure:4367: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4425,7 +4402,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4429: checking for $ac_word" >&5
|
||||
echo "configure:4406: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4458,7 +4435,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then
|
|||
# Extract the first word of "ld", so it can be a program name with args.
|
||||
set dummy ld; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4462: checking for $ac_word" >&5
|
||||
echo "configure:4439: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4497,7 +4474,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4501: checking for $ac_word" >&5
|
||||
echo "configure:4478: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4530,7 +4507,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then
|
|||
# Extract the first word of "nm", so it can be a program name with args.
|
||||
set dummy nm; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4534: checking for $ac_word" >&5
|
||||
echo "configure:4511: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4569,7 +4546,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4573: checking for $ac_word" >&5
|
||||
echo "configure:4550: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4602,7 +4579,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4606: checking for $ac_word" >&5
|
||||
echo "configure:4583: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4641,7 +4618,7 @@ fi
|
|||
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4645: checking for $ac_word" >&5
|
||||
echo "configure:4622: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4674,7 +4651,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then
|
|||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4678: checking for $ac_word" >&5
|
||||
echo "configure:4655: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4759,7 +4736,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
|
|||
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:4763: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:4740: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
|
|
@ -4806,7 +4783,7 @@ esac
|
|||
# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
|
||||
# possible, however, we can resort to mv.
|
||||
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
|
||||
echo "configure:4810: checking if symbolic links between directories work" >&5
|
||||
echo "configure:4787: checking if symbolic links between directories work" >&5
|
||||
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4854,26 +4831,6 @@ case ${enable_werror} in
|
|||
esac
|
||||
|
||||
|
||||
# If gcc is built natively with shared library enabled, set
|
||||
# $RPATH_ENVVAR to make sure the newly built gcc shared librares are
|
||||
# used.
|
||||
SET_GCC_LIB_PATH=
|
||||
if test -d ${srcdir}/gcc && test x${is_cross_compiler} = xno; then
|
||||
case "${set_lib_path}" in
|
||||
no) ;;
|
||||
*)
|
||||
eval "d=\$$RPATH_ENVVAR"
|
||||
if test x"$d" != x; then
|
||||
d="$pwd/gcc:$d"
|
||||
else
|
||||
d="$pwd/gcc"
|
||||
fi
|
||||
SET_GCC_LIB_PATH="\$(RPATH_ENVVAR)=$d; export \$(RPATH_ENVVAR);"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
trap '' 1 2 15
|
||||
cat > confcache <<\EOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
@ -5067,7 +5024,6 @@ s%@target_makefile_frag@%%g
|
|||
s%@alphaieee_frag@%%g
|
||||
/@ospace_frag@/r $ospace_frag
|
||||
s%@ospace_frag@%%g
|
||||
s%@SET_LIB_PATH@%$SET_LIB_PATH%g
|
||||
s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
|
||||
s%@BUILD_PREFIX@%$BUILD_PREFIX%g
|
||||
s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
|
||||
|
|
@ -5139,7 +5095,6 @@ s%@stage1_cflags@%$stage1_cflags%g
|
|||
s%@CREATE_LINK_TO_DIR@%$CREATE_LINK_TO_DIR%g
|
||||
s%@UNDO_LINK_TO_DIR@%$UNDO_LINK_TO_DIR%g
|
||||
s%@stage2_werror_flag@%$stage2_werror_flag%g
|
||||
s%@SET_GCC_LIB_PATH@%$SET_GCC_LIB_PATH%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
|
|
|||
43
configure.in
43
configure.in
|
|
@ -1625,28 +1625,6 @@ case "${host}" in
|
|||
;;
|
||||
esac
|
||||
|
||||
# If no --enable-shared nor --disable-shared is specified, we set up
|
||||
# LD_LIBRARY_PATH when we build for gcc.
|
||||
case $enable_shared in
|
||||
"")
|
||||
if test -d ${srcdir}/gcc; then
|
||||
set_lib_path=yes
|
||||
else
|
||||
set_lib_path=no
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
set_lib_path=$enable_shared
|
||||
;;
|
||||
esac
|
||||
|
||||
# If --enable-shared was set, we must set LD_LIBRARY_PATH so that the
|
||||
# binutils tools will find libbfd.so.
|
||||
case "${set_lib_path}" in
|
||||
no) SET_LIB_PATH= ;;
|
||||
*) SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)" ;;
|
||||
esac
|
||||
|
||||
case "${host}" in
|
||||
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
|
||||
*-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
|
||||
|
|
@ -2116,7 +2094,6 @@ AC_SUBST_FILE(alphaieee_frag)
|
|||
AC_SUBST_FILE(ospace_frag)
|
||||
|
||||
# Miscellanea: directories, flags, etc.
|
||||
AC_SUBST(SET_LIB_PATH)
|
||||
AC_SUBST(RPATH_ENVVAR)
|
||||
AC_SUBST(BUILD_PREFIX)
|
||||
AC_SUBST(BUILD_PREFIX_1)
|
||||
|
|
@ -2295,24 +2272,4 @@ case ${enable_werror} in
|
|||
esac
|
||||
AC_SUBST(stage2_werror_flag)
|
||||
|
||||
# If gcc is built natively with shared library enabled, set
|
||||
# $RPATH_ENVVAR to make sure the newly built gcc shared librares are
|
||||
# used.
|
||||
SET_GCC_LIB_PATH=
|
||||
if test -d ${srcdir}/gcc && test x${is_cross_compiler} = xno; then
|
||||
case "${set_lib_path}" in
|
||||
no) ;;
|
||||
*)
|
||||
eval "d=\$$RPATH_ENVVAR"
|
||||
if test x"$d" != x; then
|
||||
d="$pwd/gcc:$d"
|
||||
else
|
||||
d="$pwd/gcc"
|
||||
fi
|
||||
SET_GCC_LIB_PATH="\$(RPATH_ENVVAR)=$d; export \$(RPATH_ENVVAR);"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
AC_SUBST(SET_GCC_LIB_PATH)
|
||||
|
||||
AC_OUTPUT(Makefile)
|
||||
|
|
|
|||
|
|
@ -1032,9 +1032,6 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
|
|||
# language hooks, generated by configure
|
||||
@language_hooks@
|
||||
|
||||
# Set up library path if needed.
|
||||
@set_gcc_lib_path@
|
||||
|
||||
# per-language makefile fragments
|
||||
ifneq ($(LANG_MAKEFRAGS),)
|
||||
include $(LANG_MAKEFRAGS)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
m4_include([../config/accross.m4])
|
||||
m4_include([../config/acx.m4])
|
||||
m4_include([../config/gettext-sister.m4])
|
||||
m4_include([../config/gcc-lib-path.m4])
|
||||
m4_include([../config/iconv.m4])
|
||||
m4_include([../config/lcmessage.m4])
|
||||
m4_include([../config/lib-ld.m4])
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default set_gcc_lib_path GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='language_hooks'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -15353,21 +15353,6 @@ objdir=`${PWDCMD-pwd}`
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test x"$SET_GCC_LIB_PATH_CMD" != x; then
|
||||
# SET_GCC_LIB_PATH_CMD is "XXX=path; export XXX;". It is expanded to
|
||||
#
|
||||
# eval "set_gcc_lib_path=XXX=path; export XXX;"
|
||||
#
|
||||
eval "set_gcc_lib_path=$SET_GCC_LIB_PATH_CMD"
|
||||
# It will set set_gcc_lib_path to "export XXX=path" for GNU make.
|
||||
set_gcc_lib_path="export $set_gcc_lib_path"
|
||||
else
|
||||
set_gcc_lib_path=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
|
@ -16186,7 +16171,6 @@ s,@xm_defines@,$xm_defines,;t t
|
|||
s,@c_target_objs@,$c_target_objs,;t t
|
||||
s,@cxx_target_objs@,$cxx_target_objs,;t t
|
||||
s,@target_cpu_default@,$target_cpu_default,;t t
|
||||
s,@set_gcc_lib_path@,$set_gcc_lib_path,;t t
|
||||
s,@GMPLIBS@,$GMPLIBS,;t t
|
||||
s,@GMPINC@,$GMPINC,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
|
|
|
|||
|
|
@ -3332,8 +3332,6 @@ AC_SUBST(target_cpu_default)
|
|||
|
||||
AC_SUBST_FILE(language_hooks)
|
||||
|
||||
TL_AC_GNU_MAKE_GCC_LIB_PATH
|
||||
|
||||
# Echo link setup.
|
||||
if test x${build} = x${host} ; then
|
||||
if test x${host} = x${target} ; then
|
||||
|
|
|
|||
Loading…
Reference in New Issue