diff options
| author | Reid Kleckner <rnk@google.com> | 2016-03-22 01:14:36 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-03-22 01:14:36 +0000 |
| commit | 0cd4db6dd4b255f8821cfc1239fbe9fa270a1386 (patch) | |
| tree | e0495c433e67678beac569a56e9383d85b9c78c5 /test/asan | |
| parent | 32897ea25860cbe5d50ce21e7e200d4e38a0ce11 (diff) | |
Move -fms-compatibility-version=19 into target cflags
This reduces cflags duplication and allows us to build
sanitizer_common/tests with clang and the VS 2015 STL.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@264017 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/asan')
| -rw-r--r-- | test/asan/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | test/asan/lit.cfg | 5 | ||||
| -rw-r--r-- | test/asan/lit.site.cfg.in | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt index 3a1abc87c..b2be95720 100644 --- a/test/asan/CMakeLists.txt +++ b/test/asan/CMakeLists.txt @@ -29,13 +29,6 @@ if(APPLE) darwin_filter_host_archs(ASAN_SUPPORTED_ARCH ASAN_TEST_ARCH) endif() -# Extract the major version from CMake's MSVC_VERSION variable and pass it into -# the lit configuration. -set(MSVC_MAJOR_VERSION "") -if (MSVC) - string(SUBSTRING "${MSVC_VERSION}" 0 2 MSVC_MAJOR_VERSION) -endif() - foreach(arch ${ASAN_TEST_ARCH}) if(ANDROID) set(ASAN_TEST_TARGET_ARCH ${arch}-android) diff --git a/test/asan/lit.cfg b/test/asan/lit.cfg index 829bcda45..c50559a51 100644 --- a/test/asan/lit.cfg +++ b/test/asan/lit.cfg @@ -64,13 +64,9 @@ else: if config.android: extra_linkflags += ["-lm"] -msvc_major_version = get_required_attr(config, "msvc_major_version") - # Setup default compiler flags used with -fsanitize=address option. # FIXME: Review the set of required flags and check if it can be reduced. target_cflags = [get_required_attr(config, "target_cflags")] + extra_linkflags -if msvc_major_version: - target_cflags.append("-fms-compatibility-version=" + msvc_major_version) target_cxxflags = config.cxx_mode_flags + target_cflags clang_asan_static_cflags = (["-fsanitize=address", "-mno-omit-leaf-frame-pointer", @@ -114,7 +110,6 @@ if platform.system() == 'Windows': clang_cl_asan_cxxflags = ["-fsanitize=address", "-Wno-deprecated-declarations", "-WX", - "-fms-compatibility-version=" + msvc_major_version, "-D_HAS_EXCEPTIONS=0", "-Zi"] + target_cflags if config.asan_dynamic: diff --git a/test/asan/lit.site.cfg.in b/test/asan/lit.site.cfg.in index 0e7cd1206..1e83c749f 100644 --- a/test/asan/lit.site.cfg.in +++ b/test/asan/lit.site.cfg.in @@ -5,7 +5,6 @@ config.name_suffix = "@ASAN_TEST_CONFIG_SUFFIX@" config.asan_lit_source_dir = "@ASAN_LIT_SOURCE_DIR@" config.target_cflags = "@ASAN_TEST_TARGET_CFLAGS@" -config.msvc_major_version = "@MSVC_MAJOR_VERSION@" config.clang = "@ASAN_TEST_TARGET_CC@" config.bits = "@ASAN_TEST_BITS@" config.android = "@ANDROID@" |