diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-11-24 02:25:50 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2012-11-24 02:25:50 +0000 |
| commit | 5213f20cfbb42c5430ccd442a8630b0557743a1c (patch) | |
| tree | e27e4b3302413494ddb072fb5c9478815a4dea7d | |
| parent | 1773438a1b701f62cc01e69b33d29954dab09207 (diff) | |
| download | gcc-5213f20cfbb42c5430ccd442a8630b0557743a1c.zip gcc-5213f20cfbb42c5430ccd442a8630b0557743a1c.tar.gz gcc-5213f20cfbb42c5430ccd442a8630b0557743a1c.tar.bz2 | |
configure.ac (multiarch): Use $enableval instead of $withval.
2012-11-24 Matthias Klose <doko@ubuntu.com>
* configure.ac (multiarch): Use $enableval instead of $withval.
* configure: Regenerate.
* config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32.
From-SVN: r193776
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/i386/t-kfreebsd | 2 | ||||
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 6 |
4 files changed, 13 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f7b3c92..0ac58ee 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-11-24 Matthias Klose <doko@ubuntu.com> + + * configure.ac (multiarch): Use $enableval instead of $withval. + * configure: Regenerate. + * config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32. + 2012-11-23 Tobias Burnus <burnus@net-b.de> * doc/invoke.texi (-fsanitize=address): Remove obsolete diff --git a/gcc/config/i386/t-kfreebsd b/gcc/config/i386/t-kfreebsd index b4310df..b8338a9 100644 --- a/gcc/config/i386/t-kfreebsd +++ b/gcc/config/i386/t-kfreebsd @@ -2,4 +2,4 @@ MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu) # MULTILIB_OSDIRNAMES are set in t-linux64. KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target)))) -MULTILIB_OSDIRNAMES := $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES)) +MULTILIB_OSDIRNAMES := $(filter-out mx32=% $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES))) diff --git a/gcc/configure b/gcc/configure index b16fb3f..e2c119e 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7024,9 +7024,9 @@ fi # Determine whether or not multiarch is enabled. # Check whether --enable-multiarch was given. if test "${enable_multiarch+set}" = set; then : - enableval=$enable_multiarch; case "${withval}" in -yes|no|auto) enable_multiarch=$withval;; -*) as_fn_error "bad value ${withval} given for --enable-multiarch option" "$LINENO" 5 ;; + enableval=$enable_multiarch; case "${enableval}" in +yes|no|auto) enable_multiarch=$enableval;; +*) as_fn_error "bad value ${enableval} given for --enable-multiarch option" "$LINENO" 5 ;; esac else enable_multiarch=auto diff --git a/gcc/configure.ac b/gcc/configure.ac index 4878c35..c6f57bd 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -617,9 +617,9 @@ AC_SUBST(enable_multilib) AC_ARG_ENABLE(multiarch, [AS_HELP_STRING([--enable-multiarch], [enable support for multiarch paths])], -[case "${withval}" in -yes|no|auto) enable_multiarch=$withval;; -*) AC_MSG_ERROR(bad value ${withval} given for --enable-multiarch option) ;; +[case "${enableval}" in +yes|no|auto) enable_multiarch=$enableval;; +*) AC_MSG_ERROR(bad value ${enableval} given for --enable-multiarch option) ;; esac], [enable_multiarch=auto]) if test x${enable_multiarch} = xauto; then if test x${with_native_system_header_dir} != x; then |