diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-05-30 18:16:14 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-05-30 18:16:14 +0100 |
| commit | 1007a55ca4577e09c121f5b9bebb07a3da608171 (patch) | |
| tree | 80445252005987111a91256b35774483d66bfb2f /configure | |
| parent | 2c9363445d0e10790eca2c691683f6ba99afcf61 (diff) | |
| download | gcc-1007a55ca4577e09c121f5b9bebb07a3da608171.tar.gz | |
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
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure b/configure index 36455713f33..e9ca33e6f24 100755 --- a/configure +++ b/configure @@ -3090,7 +3090,7 @@ else fi if test "${ENABLE_LIBSTDCXX}" = "no" ; then - noconfigdirs="$noconfigdirs libstdc++-v3" + noconfigdirs="$noconfigdirs target-libstdc++-v3" fi # 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 -# 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 - *,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" ;; |