From 85115a11ec11c5a066486338d2c6fa1564fd521d Mon Sep 17 00:00:00 2001 From: bonzini Date: Wed, 30 Mar 2005 08:18:08 +0000 Subject: 2005-03-31 Paolo Bonzini * 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 * config/gcc-lib-path.m4: Remove. gcc: 2005-03-31 Paolo Bonzini * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97249 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/Makefile.in | 3 --- gcc/aclocal.m4 | 1 - gcc/configure | 18 +----------------- gcc/configure.ac | 2 -- 4 files changed, 1 insertion(+), 23 deletions(-) (limited to 'gcc') diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 003e4ac44c6..1d122084bf9 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -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) diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index dfcc20be148..f5e13d8a15b 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -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]) diff --git a/gcc/configure b/gcc/configure index a8dd3da4cd6..f2c70ba0682 100755 --- a/gcc/configure +++ b/gcc/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #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 diff --git a/gcc/configure.ac b/gcc/configure.ac index 1d6ced18686..46886fb2d7d 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -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 -- cgit v1.2.1