diff options
| author | Kuba Brecka <kuba.brecka@gmail.com> | 2016-10-18 18:33:42 +0000 |
|---|---|---|
| committer | Kuba Brecka <kuba.brecka@gmail.com> | 2016-10-18 18:33:42 +0000 |
| commit | efdc36c80202653e7f6469565e9cfabc9355786b (patch) | |
| tree | ffa1900fa8c1b5b2b4538f421abc7ff3a847a207 | |
| parent | ecc314403156e3492d9bcca014c6c0c3556434c3 (diff) | |
| download | bcm5719-llvm-efdc36c80202653e7f6469565e9cfabc9355786b.tar.gz bcm5719-llvm-efdc36c80202653e7f6469565e9cfabc9355786b.zip | |
[tsan] Always use -std=c++11 in TSan tests
We currently only pass -std=c++11 when we have an instrumented libcxx.
Differential Revision: https://reviews.llvm.org/D25740
llvm-svn: 284512
| -rw-r--r-- | compiler-rt/test/tsan/lit.cfg | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler-rt/test/tsan/lit.cfg b/compiler-rt/test/tsan/lit.cfg index 1fc1eccd15e..e0f93c7dd7b 100644 --- a/compiler-rt/test/tsan/lit.cfg +++ b/compiler-rt/test/tsan/lit.cfg @@ -44,7 +44,7 @@ clang_tsan_cflags = (["-fsanitize=thread", [config.target_cflags] + config.debug_info_flags + extra_cflags) -clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags +clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags + ["-std=c++11"] # Add additional flags if we're using instrumented libc++. # Instrumented libcxx currently not supported on Darwin. if config.has_libcxx and config.host_os != 'Darwin': @@ -54,8 +54,7 @@ if config.has_libcxx and config.host_os != 'Darwin': libcxx_incdir = os.path.join(libcxx_path, "include", "c++", "v1") libcxx_libdir = os.path.join(libcxx_path, "lib") libcxx_so = os.path.join(libcxx_libdir, "libc++.so") - clang_tsan_cxxflags += ["-std=c++11", - "-nostdinc++", + clang_tsan_cxxflags += ["-nostdinc++", "-I%s" % libcxx_incdir, libcxx_so, "-Wl,-rpath=%s" % libcxx_libdir] |
