diff options
| author | Ludovic Henry <luhenry@microsoft.com> | 2018-09-04 00:30:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 00:30:31 +0300 |
| commit | 0dbcdd5c2812570b96876718f9f8e5f2b4c97177 (patch) | |
| tree | 9d251a6d127a681951c26bfa5e7a93833a492b19 /scripts/ci/run-test-mac-sdk.sh | |
| parent | f25f9e5f2b5e587a4e86b3ddc8cb5052240096df (diff) | |
[sdks] Add cross-{arm,arm64,x86,x86_64}{,-win} runtimes for XA + Unify provisioning of LLVM for both Android and iOS. (#10445)
* [sdks] Add CrossRuntimeTemplate
* [sdks] Add cross-{arm,arm64,x86,x86_64}{,-win} runtimes for XA
* [sdks] Use CrossRuntimeTemplate for iOS
* [sdks] Factor various variables for RuntimeTemplate
* [sdks] Use MonoRuntime template for desktop-x86_64
* [sdks] Unify provisioning of LLVM for both Android and iOS.
A global CFLAGS would be set in `run-jenkins.sh`, and that would screw up with LLVM. The global CFLAGS makes sense as long as we are only building Mono, but that's not the case with LLVM anymore.
* [sdks] Remove android-armeabi, it's been removed from XA already and the target has been deprecated in the NDK
Diffstat (limited to 'scripts/ci/run-test-mac-sdk.sh')
| -rwxr-xr-x | scripts/ci/run-test-mac-sdk.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/ci/run-test-mac-sdk.sh b/scripts/ci/run-test-mac-sdk.sh index 5c3503674b0..65af780e9ee 100755 --- a/scripts/ci/run-test-mac-sdk.sh +++ b/scripts/ci/run-test-mac-sdk.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -${TESTCMD} --label=bockbuild --timeout=300m --fatal ${MONO_REPO_ROOT}/scripts/mac-sdk-package.sh +${TESTCMD} --label=bockbuild --timeout=300m --fatal CFLAGS="$CFLAGS $EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $EXTRA_CXXFLAGS" LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" ${MONO_REPO_ROOT}/scripts/mac-sdk-package.sh # switch to using package Mono instead of system export PATH=${MONO_REPO_ROOT}/external/bockbuild/stage/bin:$PATH |