summaryrefslogtreecommitdiffstats
path: root/Modules/CompilerId
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-06-18 17:39:23 (GMT)
committerBrad King <brad.king@kitware.com>2018-06-18 17:44:43 (GMT)
commitbc5bcad45e1eaebbea0f1409f096d166cdb778d9 (patch)
tree288910094177ffd862809b3d596dbaa7521aa64d /Modules/CompilerId
parentef5e2e8a62982ebccf4883fc7a01cdb66f8ca183 (diff)
downloadCMake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.zip
CMake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.tar.gz
CMake-bc5bcad45e1eaebbea0f1409f096d166cdb778d9.tar.bz2
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/CompilerId')
-rw-r--r--Modules/CompilerId/Xcode-3.pbxproj.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in
index 1cbaa57..94bcbf8 100644
--- a/Modules/CompilerId/Xcode-3.pbxproj.in
+++ b/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -58,7 +58,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "echo \"GCC_VERSION=$GCC_VERSION\" ; echo \"CURRENT_ARCH=$CURRENT_ARCH\"";
+ shellScript = "echo \"GCC_VERSION=$GCC_VERSION\" ; echo \"ARCHS=$ARCHS\"";
showEnvVarsInLog = 0;
};
2C18F0B515DC1DCE00593670 = {