re PR libobjc/14948 (irix6.5 bootstrap fails in mabi=64/libobjc)
PR libobjc/14948 * configure.ac: De-precious CC so multilibs work. * configure: Regenerate. From-SVN: r80724
This commit is contained in:
Nathanael Nerode
parent
a49877d87f
commit
db7f3c6929
|
|
@ -1,3 +1,9 @@
|
|||
2004-04-15 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
PR libobjc/14948
|
||||
* configure.ac: De-precious CC so multilibs work.
|
||||
* configure: Regenerate.
|
||||
|
||||
2004-04-14 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* configure.ac: Restore toolexecdir.
|
||||
|
|
|
|||
|
|
@ -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 VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexecdir toolexeclibdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP EGREP GTHREAD_FLAGS 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 VERSION OBJC_BOEHM_GC toplevel_srcdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical glibcpp_srcdir gcc_version toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP ac_ct_STRIP LIBTOOL SET_MAKE CPP CPPFLAGS EGREP GTHREAD_FLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -750,26 +750,14 @@ ac_env_target_alias_set=${target_alias+set}
|
|||
ac_env_target_alias_value=$target_alias
|
||||
ac_cv_env_target_alias_set=${target_alias+set}
|
||||
ac_cv_env_target_alias_value=$target_alias
|
||||
ac_env_CC_set=${CC+set}
|
||||
ac_env_CC_value=$CC
|
||||
ac_cv_env_CC_set=${CC+set}
|
||||
ac_cv_env_CC_value=$CC
|
||||
ac_env_CFLAGS_set=${CFLAGS+set}
|
||||
ac_env_CFLAGS_value=$CFLAGS
|
||||
ac_cv_env_CFLAGS_set=${CFLAGS+set}
|
||||
ac_cv_env_CFLAGS_value=$CFLAGS
|
||||
ac_env_LDFLAGS_set=${LDFLAGS+set}
|
||||
ac_env_LDFLAGS_value=$LDFLAGS
|
||||
ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
|
||||
ac_cv_env_LDFLAGS_value=$LDFLAGS
|
||||
ac_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_env_CPPFLAGS_value=$CPPFLAGS
|
||||
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
|
||||
ac_env_CPP_set=${CPP+set}
|
||||
ac_env_CPP_value=$CPP
|
||||
ac_cv_env_CPP_set=${CPP+set}
|
||||
ac_cv_env_CPP_value=$CPP
|
||||
ac_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_env_CPPFLAGS_value=$CPPFLAGS
|
||||
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
|
||||
|
||||
#
|
||||
# Report the --help message.
|
||||
|
|
@ -1587,6 +1575,12 @@ esac
|
|||
# --------
|
||||
|
||||
|
||||
|
||||
# We must force CC to /not/ be a precious variable; otherwise
|
||||
# the wrong, non-multilib-adjusted value will be used in multilibs.
|
||||
# As a side effect, we have to subst CFLAGS ourselves.
|
||||
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
|
|
@ -2546,6 +2540,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
|||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}as; ac_word=$2
|
||||
|
|
@ -3610,7 +3607,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
|
|||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3613 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3610 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5605,12 +5602,10 @@ s,@gcc_version@,$gcc_version,;t t
|
|||
s,@toolexecdir@,$toolexecdir,;t t
|
||||
s,@toolexeclibdir@,$toolexeclibdir,;t t
|
||||
s,@CC@,$CC,;t t
|
||||
s,@CFLAGS@,$CFLAGS,;t t
|
||||
s,@LDFLAGS@,$LDFLAGS,;t t
|
||||
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
||||
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
||||
s,@EXEEXT@,$EXEEXT,;t t
|
||||
s,@OBJEXT@,$OBJEXT,;t t
|
||||
s,@CFLAGS@,$CFLAGS,;t t
|
||||
s,@AS@,$AS,;t t
|
||||
s,@ac_ct_AS@,$ac_ct_AS,;t t
|
||||
s,@AR@,$AR,;t t
|
||||
|
|
@ -5626,6 +5621,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
|
|||
s,@LIBTOOL@,$LIBTOOL,;t t
|
||||
s,@SET_MAKE@,$SET_MAKE,;t t
|
||||
s,@CPP@,$CPP,;t t
|
||||
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
||||
s,@EGREP@,$EGREP,;t t
|
||||
s,@GTHREAD_FLAGS@,$GTHREAD_FLAGS,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
|
|
|
|||
|
|
@ -159,7 +159,16 @@ AC_SUBST(toolexeclibdir)
|
|||
# --------
|
||||
|
||||
GCC_NO_EXECUTABLES
|
||||
|
||||
# We must force CC to /not/ be a precious variable; otherwise
|
||||
# the wrong, non-multilib-adjusted value will be used in multilibs.
|
||||
# As a side effect, we have to subst CFLAGS ourselves.
|
||||
m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
|
||||
m4_define([_AC_ARG_VAR_PRECIOUS],[])
|
||||
AC_PROG_CC
|
||||
m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
|
||||
AC_CHECK_TOOL(AS, as)
|
||||
AC_CHECK_TOOL(AR, ar)
|
||||
|
|
|
|||
Loading…
Reference in New Issue