mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-11 15:31:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: Move AM_ENABLE_MULTILIB before AC_PROG_CC.

Browse Source 
2015-01-26  Matthias Klose  <doko@ubuntu.com>

        * configure.ac: Move AM_ENABLE_MULTILIB before AC_PROG_CC.
        * configure: Regenerate.

From-SVN: r220165
This commit is contained in:
Matthias Klose 2015-01-27 12:50:46 +00:00
parent 755359b75e
commit 94213c1020
3 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsanitizer/ChangeLog
View File

@ -1,8 +1,13 @@
2015-01-26 Matthias Klose <doko@ubuntu.com>
* configure.ac: Move AM_ENABLE_MULTILIB before AC_PROG_CC.
* configure: Regenerate.
2015-01-25 Venkataramanan Kumar <venkataramanan.kumar@linaro.org>
* configure.ac (TSAN_TARGET_DEPENDENT_OBJECTS): Undefine.
* configure.ac (TSAN_TARGET_DEPENDENT_OBJECTS): Undefine.
* configure: Regenerate.
* configure.tgt (TSAN_TARGET_DEPENDENT_OBJECTS): Define.
* configure.tgt (TSAN_TARGET_DEPENDENT_OBJECTS): Define.
2015-01-25 Venkataramanan Kumar <venkataramanan.kumar@linaro.org>

105
libsanitizer/configure vendored
View File

@ -660,7 +660,6 @@ toolexecdir
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
multi_basedir
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@ -718,6 +717,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
multi_basedir
target_alias
host_alias
build_alias
@ -759,9 +759,9 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_multilib
enable_version_specific_runtime_libs
enable_dependency_tracking
enable_multilib
enable_maintainer_mode
enable_shared
enable_static
@ -1405,10 +1405,10 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-multilib build many library versions (default)
--enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-multilib build many library versions (default)
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--enable-shared[=PKGS] build shared libraries [default=yes]
@ -2626,6 +2626,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../.."
else
multi_basedir="$srcdir/$with_multisrctop.."
fi
else
multi_basedir="$srcdir/.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-version-specific-runtime-libs" >&5
$as_echo_n "checking for --enable-version-specific-runtime-libs... " >&6; }
# Check whether --enable-version-specific-runtime-libs was given.
@ -4702,43 +4740,6 @@ fi
# Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
yes) multilib=yes ;;
no) multilib=no ;;
*) as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
esac
else
multilib=yes
fi
# We may get other options which we leave undocumented:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# See config-ml.in if you want the gory details.
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
multi_basedir="$srcdir/$with_multisrctop../.."
else
multi_basedir="$srcdir/$with_multisrctop.."
fi
else
multi_basedir="$srcdir/.."
fi
# Even if the default multilib is not a cross compilation,
# it may be that some of the other multilibs are.
if test $cross_compiling = no && test $multilib = yes \
&& test "x${with_multisubdir}" != x ; then
cross_compiling=maybe
fi
ac_config_commands="$ac_config_commands default-1"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@ -12020,7 +12021,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12023 "configure"
#line 12024 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12126,7 +12127,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12129 "configure"
#line 12130 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -17093,7 +17094,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
srcdir="$srcdir"
host="$host"
@ -17108,6 +17108,7 @@ CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
GCJ="$GCJ"
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
# The HP-UX ksh and POSIX shell print the target directory to stdout
@ -17495,8 +17496,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"gstdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gstdint.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@ -18094,6 +18095,14 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
# Autoconf 2.62 quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
@ -18189,14 +18198,6 @@ $as_echo X"$file" |
done
}
;;
"default-1":C)
# Only add multilib support code if we just rebuilt the top-level
# Makefile.
case " $CONFIG_FILES " in
*" Makefile "*)
ac_file=Makefile . ${multi_basedir}/config-ml.in
;;
esac ;;
"libtool":C)
# See if we are running on zsh, and set the options which allow our

3
libsanitizer/configure.ac
View File

@ -5,6 +5,8 @@ AC_PREREQ([2.64])
AC_INIT(package-unused, version-unused, libsanitizer)
AC_CONFIG_SRCDIR([include/sanitizer/common_interface_defs.h])
AM_ENABLE_MULTILIB(, ..)
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
AC_ARG_ENABLE(version-specific-runtime-libs,
[ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ],
@ -26,7 +28,6 @@ AC_SUBST(target_alias)
GCC_LIBSTDCXX_RAW_CXX_FLAGS
AM_INIT_AUTOMAKE(foreign no-dist)
AM_ENABLE_MULTILIB(, ..)
AM_MAINTAINER_MODE
# Calculate toolexeclibdir