Skip to content

Commit 0d829d9

Browse files
committed
Disable libsanitizer for non-C++ builds.
* configure.ac (noconfigdirs): Merge from GCC. * configure: Regenerate.
1 parent 065b05f commit 0d829d9

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2012-11-28 Jan-Benedict Glaw <[email protected]>
2+
3+
* configure.ac (noconfigdirs): Merge from GCC.
4+
* configure: Regenerate.
5+
16
2012-11-19 Jan-Benedict Glaw <[email protected]>
27

38
* config.sub (arm): Merge from upstream: Handle armv[6-8] targets.

configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -6437,11 +6437,11 @@ case ,${enable_languages},:${enable_objc_gc} in
64376437
;;
64386438
esac
64396439

6440-
# Disable libitm if we're not building C++
6440+
# Disable libitm and libsanitizer if we're not building C++
64416441
case ,${enable_languages}, in
64426442
*,c++,*) ;;
64436443
*)
6444-
noconfigdirs="$noconfigdirs target-libitm"
6444+
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
64456445
;;
64466446
esac
64476447

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -2008,11 +2008,11 @@ case ,${enable_languages},:${enable_objc_gc} in
20082008
;;
20092009
esac
20102010

2011-
# Disable libitm if we're not building C++
2011+
# Disable libitm and libsanitizer if we're not building C++
20122012
case ,${enable_languages}, in
20132013
*,c++,*) ;;
20142014
*)
2015-
noconfigdirs="$noconfigdirs target-libitm"
2015+
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
20162016
;;
20172017
esac
20182018

0 commit comments

Comments
 (0)