[test-suite] r267607 - cmake/caches: Improve/rename iphoneos caches.

[Matthias Braun via llvm-commits]

Author: matze
Date: Tue Apr 26 16:20:02 2016
New Revision: 267607

URL: http://llvm.org/viewvc/llvm-project?rev=267607&view=rev
Log:
cmake/caches: Improve/rename iphoneos caches.

- Rename the caches to iphoneos to better match possible watchos/tvos
  additions.
- Do not change CMAKE_CXX_COMPILER defaults to point to the SDK. This
  way we still have the cmake logic that looks for a c++ compiler
  matching the c compiler => Overriding CMAKE_C_COMPILER will pick up
  the matching c++ compiler instead of defaulting to the SDK one.

Added:
    test-suite/trunk/cmake/caches/target-arm64-iphoneos.cmake
      - copied, changed from r267461, test-suite/trunk/cmake/caches/target-arm64-ios.cmake
    test-suite/trunk/cmake/caches/target-thumbv7s-iphoneos.cmake
      - copied, changed from r267461, test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake
Removed:
    test-suite/trunk/cmake/caches/target-arm64-ios.cmake
    test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake
Modified:
    test-suite/trunk/cmake/caches/util/xcode_sdk.cmake

Removed: test-suite/trunk/cmake/caches/target-arm64-ios.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/target-arm64-ios.cmake?rev=267606&view=auto
==============================================================================
--- test-suite/trunk/cmake/caches/target-arm64-ios.cmake (original)
+++ test-suite/trunk/cmake/caches/target-arm64-ios.cmake (removed)
@@ -1,3 +0,0 @@
-set(XCRUN_FLAGS --toolchain iOS --sdk iphoneos)
-set(ARCH_FLAGS "${ARCH_FLAGS} -arch arm64")
-include(${CMAKE_CURRENT_LIST_DIR}/util/xcode_sdk.cmake)

Copied: test-suite/trunk/cmake/caches/target-arm64-iphoneos.cmake (from r267461, test-suite/trunk/cmake/caches/target-arm64-ios.cmake)
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/target-arm64-iphoneos.cmake?p2=test-suite/trunk/cmake/caches/target-arm64-iphoneos.cmake&p1=test-suite/trunk/cmake/caches/target-arm64-ios.cmake&r1=267461&r2=267607&rev=267607&view=diff
==============================================================================
    (empty)

Removed: test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake?rev=267606&view=auto
==============================================================================
--- test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake (original)
+++ test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake (removed)
@@ -1,3 +0,0 @@
-set(XCRUN_FLAGS --toolchain iOS --sdk iphoneos)
-set(ARCH_FLAGS "${ARCH_FLAGS} -arch thumbv7s")
-include(${CMAKE_CURRENT_LIST_DIR}/util/xcode_sdk.cmake)

Copied: test-suite/trunk/cmake/caches/target-thumbv7s-iphoneos.cmake (from r267461, test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake)
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/target-thumbv7s-iphoneos.cmake?p2=test-suite/trunk/cmake/caches/target-thumbv7s-iphoneos.cmake&p1=test-suite/trunk/cmake/caches/target-thumbv7s-ios.cmake&r1=267461&r2=267607&rev=267607&view=diff
==============================================================================
    (empty)

Modified: test-suite/trunk/cmake/caches/util/xcode_sdk.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/caches/util/xcode_sdk.cmake?rev=267607&r1=267606&r2=267607&view=diff
==============================================================================
--- test-suite/trunk/cmake/caches/util/xcode_sdk.cmake (original)
+++ test-suite/trunk/cmake/caches/util/xcode_sdk.cmake Tue Apr 26 16:20:02 2016
@@ -14,7 +14,8 @@ execute_process(COMMAND xcrun ${XCRUN_FL
 xcrun_find(LINKER_PATH ld)
 get_filename_component(LINKER_DIR ${LINKER_PATH} DIRECTORY)
 xcrun_find_update_cache(CMAKE_C_COMPILER clang)
-xcrun_find_update_cache(CMAKE_CXX_COMPILER clang++)
+# Note that we do not search CMAKE_CXX_COMPILER to not disturb cmakes
+# convenient way to defaulting to xxx/clang++ if the c compiler is xxx/clang.
 xcrun_find_update_cache(CMAKE_RANLIB ranlib)
 xcrun_find_update_cache(CMAKE_AR ar)
 xcrun_find_update_cache(CMAKE_STRIP strip)
@@ -25,5 +26,5 @@ xcrun_find_update_cache(CMAKE_NM nm)
 set(CMAKE_OSX_SYSROOT "${SDK_PATH}" CACHE STRING "")
 
 set(ARCH_FLAGS "${ARCH_FLAGS} --sysroot ${SDK_PATH}")
-set(ARCH_FLAGS "${ARCH_FLAGS} -ccc-install-dir ${LINKER_DIR}")
+set(ARCH_FLAGS "${ARCH_FLAGS} -B ${LINKER_DIR}")
 include(${CMAKE_CURRENT_LIST_DIR}/arch_flags.cmake)