git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/61011 (libstdc++-v3 should be target-libstdc++-v3 in top level configure) 

PR libstdc++/61011
	* configure.ac (--disable-libstdcxx): Set noconfigdirs correctly.
	Disable libcilkrts, libitm, libsanitizer when not building libstdc++.
	* configure: Regenerate.

From-SVN: r211087
This commit is contained in:
Jonathan Wakely 2014-05-30 18:16:14 +01:00 committed by Jonathan Wakely
parent 2c9363445d
commit 1007a55ca4
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-05-30 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/61011
* configure.ac (--disable-libstdcxx): Set noconfigdirs correctly.
Disable libcilkrts, libitm, libsanitizer when not building libstdc++.
* configure: Regenerate.
2014-05-28 Pedro Alves <palves@redhat.com> 2014-05-28 Pedro Alves <palves@redhat.com>
* MAINTAINERS (Write After Approval): Add myself. * MAINTAINERS (Write After Approval): Add myself.

14
configure vendored
View File

@ -3090,7 +3090,7 @@ else
fi fi
if test "${ENABLE_LIBSTDCXX}" = "no" ; then if test "${ENABLE_LIBSTDCXX}" = "no" ; then
noconfigdirs="$noconfigdirs libstdc++-v3" noconfigdirs="$noconfigdirs target-libstdc++-v3"
fi fi
# Save it here so that, even in case of --enable-libgcj, if the Java # Save it here so that, even in case of --enable-libgcj, if the Java
@ -6628,9 +6628,17 @@ case ,${enable_languages},:${enable_objc_gc} in
;; ;;
esac esac
# Disable libitm, libsanitizer, libvtv if we're not building C++ # Disable libcilkrts, libitm, libsanitizer, libvtv if we're not building C++
case ,${enable_languages}, in case ,${enable_languages}, in
*,c++,*) ;; *,c++,*)
# Disable libcilkrts, libitm, libsanitizer if we're not building libstdc++
case "${noconfigdirs}" in
*target-libstdc++-v3*)
noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer"
;;
*) ;;
esac
;;
*) *)
noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer target-libvtv" noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer target-libvtv"
;; ;;

14
configure.ac
View File

@ -435,7 +435,7 @@ AS_HELP_STRING([--disable-libstdcxx],
ENABLE_LIBSTDCXX=$enableval, ENABLE_LIBSTDCXX=$enableval,
ENABLE_LIBSTDCXX=default) ENABLE_LIBSTDCXX=default)
[if test "${ENABLE_LIBSTDCXX}" = "no" ; then [if test "${ENABLE_LIBSTDCXX}" = "no" ; then
noconfigdirs="$noconfigdirs libstdc++-v3" noconfigdirs="$noconfigdirs target-libstdc++-v3"
fi] fi]
# Save it here so that, even in case of --enable-libgcj, if the Java # Save it here so that, even in case of --enable-libgcj, if the Java
@ -2057,9 +2057,17 @@ case ,${enable_languages},:${enable_objc_gc} in
;; ;;
esac esac
# Disable libitm, libsanitizer, libvtv if we're not building C++ # Disable libcilkrts, libitm, libsanitizer, libvtv if we're not building C++
case ,${enable_languages}, in case ,${enable_languages}, in
*,c++,*) ;; *,c++,*)
# Disable libcilkrts, libitm, libsanitizer if we're not building libstdc++
case "${noconfigdirs}" in
*target-libstdc++-v3*)
noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer"
;;
*) ;;
esac
;;
*) *)
noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer target-libvtv" noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer target-libvtv"
;; ;;