diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-18 13:39:23 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-18 13:44:43 -0400 |
| commit | bc5bcad45e1eaebbea0f1409f096d166cdb778d9 (patch) | |
| tree | 288910094177ffd862809b3d596dbaa7521aa64d /Modules/CMakeCXXCompiler.cmake.in | |
| parent | ef5e2e8a62982ebccf4883fc7a01cdb66f8ca183 (diff) | |
| download | cmake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.tar.gz | |
Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH
Xcode 10 no longer populates `CURRENT_ARCH` with the current
architecture in shell scripts and instead uses `undefined_arch`.
Instead we must use `ARCHS`. It lists all architectures separated by
spaces.
Fixes: #18085
Diffstat (limited to 'Modules/CMakeCXXCompiler.cmake.in')
| -rw-r--r-- | Modules/CMakeCXXCompiler.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in index 974886df74..8da6a8c1dc 100644 --- a/Modules/CMakeCXXCompiler.cmake.in +++ b/Modules/CMakeCXXCompiler.cmake.in @@ -17,7 +17,7 @@ set(CMAKE_CXX_SIMULATE_ID "@CMAKE_CXX_SIMULATE_ID@") set(CMAKE_CXX_SIMULATE_VERSION "@CMAKE_CXX_SIMULATE_VERSION@") @_SET_CMAKE_CXX_COMPILER_ARCHITECTURE_ID@ @SET_MSVC_CXX_ARCHITECTURE_ID@ -@SET_CMAKE_XCODE_CURRENT_ARCH@ +@SET_CMAKE_XCODE_ARCHS@ set(CMAKE_AR "@CMAKE_AR@") set(CMAKE_CXX_COMPILER_AR "@CMAKE_CXX_COMPILER_AR@") set(CMAKE_RANLIB "@CMAKE_RANLIB@") |