[zorg] r325737 - Apply r318585 "[test-suite] Fix Xcode SDK cmake cache for benchmarks using re_comp"

Volodymyr Sapsai via llvm-commits llvm-commits at lists.llvm.org
Wed Feb 21 16:43:27 PST 2018


Author: vsapsai
Date: Wed Feb 21 16:43:27 2018
New Revision: 325737

URL: http://llvm.org/viewvc/llvm-project?rev=325737&view=rev
Log:
Apply r318585 "[test-suite] Fix Xcode SDK cmake cache for benchmarks using re_comp"

Green Dragon jobs "test-suite-verify-machineinstrs-*" use CMake cache files
from zorg and were failing at linking due to missing symbol _re_comp. Apply fix
r318585 to zorg too.

rdar://problem/37725879

Modified:
    zorg/trunk/tasks/cmake/caches/util/xcode_sdk.cmake

Modified: zorg/trunk/tasks/cmake/caches/util/xcode_sdk.cmake
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/tasks/cmake/caches/util/xcode_sdk.cmake?rev=325737&r1=325736&r2=325737&view=diff
==============================================================================
--- zorg/trunk/tasks/cmake/caches/util/xcode_sdk.cmake (original)
+++ zorg/trunk/tasks/cmake/caches/util/xcode_sdk.cmake Wed Feb 21 16:43:27 2018
@@ -44,6 +44,13 @@ DYLD_LIBRARY_PATH=\"${COMPILER_DIR}/../l
   # required to pick up the correct linker to the early compiler tests. However
   # it does have an option to not link in the early tests.
   set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY CACHE STRING "")
+
+  # Some benchmarks check for the function re_comp by using
+  # check_function_exists. This function is not available in any Xcode SDK, and
+  # the check returns YES with custom built compilers when we cross-compile,
+  # because of "CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY" explained just
+  # above. We work around that by forcing it to NO.
+  set(HAVE_RE_COMP CACHE BOOL NO)
 else()
   # Search and use compiler coming with the SDK.
   # Note that we do not search CMAKE_CXX_COMPILER here. cmake will try




More information about the llvm-commits mailing list