diff options
| author | Jack Howarth <howarth@bromo.med.uc.edu> | 2012-12-06 14:49:44 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2012-12-06 14:49:44 +0000 |
| commit | 3157880f5368588bfadae12c4ba1b52c4fdee75a (patch) | |
| tree | e0909cffc6a0662e5db1d547a7e862206ec46366 /libsanitizer | |
| parent | 9e04d8a2a0619f682eb318cd132ef9d62d142815 (diff) | |
Fix PR55599/sanitizer by disabling static libasan on darwin
From-SVN: r194257
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rwxr-xr-x | libsanitizer/configure | 2 | ||||
| -rw-r--r-- | libsanitizer/configure.ac | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index ff5188f26cf..b2a4b2999a6 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2012-12-06 Jack Howarth <howarth@bromo.med.uc.edu> + + PR 55599/sanitizer + * configure.ac: Set enable_static=no on darwin. + * configure: Regenerated. + 2012-12-06 Kostya Serebryany <kcc@google.com> * All files: Merge from upstream r169392. diff --git a/libsanitizer/configure b/libsanitizer/configure index 1d64feff57b..51bb7952133 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -14497,7 +14497,7 @@ fi case "$host" in - *-*-darwin*) MAC_INTERPOSE=true ;; + *-*-darwin*) MAC_INTERPOSE=true ; enable_static=no ;; *) MAC_INTERPOSE=false ;; esac if $MAC_INTERPOSE; then diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac index 49f9cd730c3..30614e566a4 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -81,7 +81,7 @@ unset TSAN_SUPPORTED AM_CONDITIONAL(TSAN_SUPPORTED, [test "x$TSAN_SUPPORTED" = "xyes"]) case "$host" in - *-*-darwin*) MAC_INTERPOSE=true ;; + *-*-darwin*) MAC_INTERPOSE=true ; enable_static=no ;; *) MAC_INTERPOSE=false ;; esac AM_CONDITIONAL(USING_MAC_INTERPOSE, $MAC_INTERPOSE) |