From 6056d3be5f8ed0352c9df7169d4b4b3799228fb6 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 17 May 2021 10:07:30 +0300 Subject: Change 'Target arch' for macOS universal build This build containing both x86_64 and arm64 architectures. The 'Target arch' ends up in the binary package names and needs to be changed because '+' is illegal character in Amazon S3 file names so replace the '+' with '-' in the 'Target arch' section. Fixes: QTBUG-93778 Change-Id: I325210d51115ae0b1eda056636b69421f68fabd8 Reviewed-by: Antti Kokko Reviewed-by: Akseli Salovaara Reviewed-by: Toni Saario --- coin/platform_configs/macos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 322395e6..f40fc92d 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -6,7 +6,7 @@ Configurations: Id: 'macos-latest-xcode-universal-packaging-build' Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' - Target arch: 'x86_64+arm64' + Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests'] Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' Environment variables: [ -- cgit v1.2.3