aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--Makefile.in35
-rw-r--r--Makefile.tpl5
-rw-r--r--config/ChangeLog5
-rwxr-xr-xconfigure58
-rw-r--r--configure.in20
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/Makefile.in3
-rwxr-xr-xgcc/configure19
-rw-r--r--gcc/configure.ac3
10 files changed, 159 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 8294ca7..8ca249d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-23 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR bootstrap/17369
+ * Makefile.tpl (REALLY_SET_LIB_PATH): Add @SET_GCC_LIB_PATH@.
+ (configure-target-[+module+]): Add @SET_GCC_LIB_PATH@. Set and
+ export SET_GCC_LIB_PATH_CMD.
+ (configure-gcc): Likewise.
+ * Makefile.in: Regenerated.
+
+ * configure.in (SET_GCC_LIB_PATH): Set and substitute.
+ * configure: Regenerated.
+
2004-09-06 Release Manager
* GCC 3.4.2 released.
diff --git a/Makefile.in b/Makefile.in
index be11b20..5d9c327 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,6 +100,7 @@ SET_LIB_PATH = @SET_LIB_PATH@
# 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.
@@ -21975,6 +21976,8 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
case $(srcdir) in \
@@ -22055,6 +22058,8 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/newlib; \
cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
case $(srcdir) in \
@@ -22135,6 +22140,8 @@ configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libf2c; \
cd "$(TARGET_SUBDIR)/libf2c" || exit 1; \
case $(srcdir) in \
@@ -22215,6 +22222,8 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libobjc; \
cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
case $(srcdir) in \
@@ -22295,6 +22304,8 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
case $(srcdir) in \
@@ -22393,6 +22404,8 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/winsup; \
cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
case $(srcdir) in \
@@ -22473,6 +22486,8 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libgloss; \
cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
case $(srcdir) in \
@@ -22549,6 +22564,8 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libiberty; \
cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
case $(srcdir) in \
@@ -22651,6 +22668,8 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/gperf; \
cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
case $(srcdir) in \
@@ -22731,6 +22750,8 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/examples; \
cd "$(TARGET_SUBDIR)/examples" || exit 1; \
case $(srcdir) in \
@@ -22803,6 +22824,8 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libffi; \
cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
case $(srcdir) in \
@@ -22884,6 +22907,8 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/libjava; \
cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
case $(srcdir) in \
@@ -22964,6 +22989,8 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/zlib; \
cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
case $(srcdir) in \
@@ -23066,6 +23093,8 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
case $(srcdir) in \
@@ -23146,6 +23175,8 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/qthreads; \
cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
case $(srcdir) in \
@@ -23226,6 +23257,8 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
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@ \
echo Configuring in $(TARGET_SUBDIR)/rda; \
cd "$(TARGET_SUBDIR)/rda" || exit 1; \
case $(srcdir) in \
@@ -23312,6 +23345,8 @@ configure-gcc:
WINDRES="$(WINDRES)"; export WINDRES; \
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+ SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
+ @SET_GCC_LIB_PATH@ \
echo Configuring in gcc; \
cd gcc || exit 1; \
case $(srcdir) in \
diff --git a/Makefile.tpl b/Makefile.tpl
index 1c9b297..85312b4 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -103,6 +103,7 @@ SET_LIB_PATH = @SET_LIB_PATH@
# 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.
@@ -973,6 +974,8 @@ ENDIF raw_cxx +]
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@ \
echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
case $(srcdir) in \
@@ -1095,6 +1098,8 @@ configure-gcc:
WINDRES="$(WINDRES)"; export WINDRES; \
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+ SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \
+ @SET_GCC_LIB_PATH@ \
echo Configuring in gcc; \
cd gcc || exit 1; \
case $(srcdir) in \
diff --git a/config/ChangeLog b/config/ChangeLog
index b24449e..ec9b6b7 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-23 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR bootstrap/17369
+ * gcc-lib-path.m4: New file.
+
2004-09-06 Release Manager
* GCC 3.4.2 released.
diff --git a/configure b/configure
index 7e06423..eb39bb9 100755
--- a/configure
+++ b/configure
@@ -4051,6 +4051,26 @@ else
fi
MAINT=$MAINTAINER_MODE_TRUE
+# 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 "${enable_shared}" 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
@@ -4117,15 +4137,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section. Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
+t quote
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output. A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
# Without the "./", some shells look in PATH for config.status.
@@ -4304,6 +4343,7 @@ s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%$RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
+s%@SET_GCC_LIB_PATH@%$SET_GCC_LIB_PATH%g
CEOF
EOF
diff --git a/configure.in b/configure.in
index 1b691b6..47d8ac8 100644
--- a/configure.in
+++ b/configure.in
@@ -2145,4 +2145,24 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
AC_SUBST(MAINT)dnl
+# 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 "${enable_shared}" 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)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 88a8ff4..c33ed9f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-23 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR bootstrap/17369
+ * Makefile.in (@set_gcc_lib_path@): Added.
+
+ * configure.ac: Include ../config/gcc-lib-path.m4. Use
+ TL_AC_GNU_MAKE_GCC_LIB_PATH.
+ * configure: Regenerated.
+
2004-09-23 Joseph S. Myers <jsm@polyomino.org.uk>
PR c/16566
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4197432..c54ac3e 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -946,6 +946,9 @@ 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)
diff --git a/gcc/configure b/gcc/configure
index 5953520..33a3877 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -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 build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP GNATBIND ac_ct_GNATBIND strict1_warn warn_cflags WERROR nocommon_flag EGREP 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 LN_S RANLIB ac_ct_RANLIB INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LIBICONV_DEP manext objext extra_modes_file FORBUILD PACKAGE VERSION USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS CROSS ALL SYSTEM_HEADER_DIR inhibit_libc BUILD_PREFIX BUILD_PREFIX_1 CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO libgcc_visibility gthread_flags 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 gcc_version gcc_version_full gcc_version_trigger 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 symbolic_link 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 target_noncanonical c_target_objs cxx_target_objs target_cpu_default 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 build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP GNATBIND ac_ct_GNATBIND strict1_warn warn_cflags WERROR nocommon_flag EGREP 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 LN_S RANLIB ac_ct_RANLIB INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LIBICONV_DEP manext objext extra_modes_file FORBUILD PACKAGE VERSION USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS CROSS ALL SYSTEM_HEADER_DIR inhibit_libc BUILD_PREFIX BUILD_PREFIX_1 CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO libgcc_visibility gthread_flags 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 gcc_version gcc_version_full gcc_version_trigger 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 symbolic_link 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 target_noncanonical c_target_objs cxx_target_objs target_cpu_default set_gcc_lib_path LIBOBJS LTLIBOBJS'
ac_subst_files='language_hooks'
# Initialize some variables set by options.
@@ -12317,6 +12317,22 @@ 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
+
+
+
# If it doesn't already exist, create document directory
echo "checking for the document directory." 1>&2
if test -d doc ; then
@@ -13142,6 +13158,7 @@ s,@target_noncanonical@,$target_noncanonical,;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,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
/@language_hooks@/r $language_hooks
diff --git a/gcc/configure.ac b/gcc/configure.ac
index f123f0a..9b991ed 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3090,6 +3090,9 @@ AC_SUBST(target_cpu_default)
AC_SUBST_FILE(language_hooks)
+sinclude(../config/gcc-lib-path.m4)
+TL_AC_GNU_MAKE_GCC_LIB_PATH
+
# If it doesn't already exist, create document directory
echo "checking for the document directory." 1>&2
if test -d doc ; then
generated by cgit v1.1 at 2024-10-19 09:00:32 +0000