diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2019-05-29 18:54:28 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2019-05-29 18:54:28 +0000 |
| commit | 4dd6a82e2646da2dd6df444a9c3a837a56724469 (patch) | |
| tree | 315a7a866b1ff0eeb0f9645e15f13cadda1760f8 | |
| parent | e8b29c00dd0724c5dc06e981b2dc4fb391784178 (diff) | |
| download | bcm5719-llvm-4dd6a82e2646da2dd6df444a9c3a837a56724469.tar.gz bcm5719-llvm-4dd6a82e2646da2dd6df444a9c3a837a56724469.zip | |
mac: Make ubsan test config look more like asan test config
In particular, don't call get_target_flags_for_arch() since that
will cause an error in some situations:
If DARWIN_iossim_ARCHS=i386;x86_64, DARWIN_osx_ARCHS=x86_64, and
DARWIN_iossym_SYSROOT isn't set (due to the simulator sysroot not being
available), then config-ix.cmake won't add i386 to COMPILER_RT_SUPPORTED_ARCH
but ubsan's test/CMakeLists.txt would call get_target_flags_for_arch()
with i386, which would then run into the error in
get_target_flags_for_arch().
Having these conditions isn't ideal. The background here is that we
configure our mac-hosted trunk bots all the same (so they all have the
same DARWIN_*_archs, and we don't easily know if a mac host bot is
targeting mac or ios at the place where we call cmake), but only the
ios-targeting bots have ios sysroots available.
This will hopefully unbreak that use case without impacting anything
else -- and it makes ubsan and asan test setup more alike.
llvm-svn: 362010
| -rw-r--r-- | compiler-rt/test/ubsan/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt index 351bf3b829d..60ef84d7530 100644 --- a/compiler-rt/test/ubsan/CMakeLists.txt +++ b/compiler-rt/test/ubsan/CMakeLists.txt @@ -113,10 +113,7 @@ if(APPLE) endif() foreach(platform ${UBSAN_APPLE_PLATFORMS}) foreach(arch ${DARWIN_${platform}_ARCHS}) - get_target_flags_for_arch(${arch} UBSAN_TEST_TARGET_ARCH_FLAGS_AS_LIST) - string(REPLACE ";" " " UBSAN_TEST_TARGET_ARCH_FLAGS "${UBSAN_TEST_TARGET_ARCH_FLAGS_AS_LIST}") - set(UBSAN_TEST_TARGET_CFLAGS - "${UBSAN_TEST_TARGET_ARCH_FLAGS} -isysroot ${DARWIN_${platform}_SYSROOT}") + set(UBSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_${platform}_SYSROOT}") if (";${UBSAN_SUPPORTED_ARCH};" MATCHES ";${arch};") add_ubsan_device_testsuite("Standalone" ubsan ${platform} ${arch}) endif() |
