Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
8a61f1f3
Commit
8a61f1f3
authored
Jan 19, 2021
by
Isuru Fernando
Browse files
Move switching SDK to travis_osx_steps.sh
parent
88a27391
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
README.rst
README.rst
+0
-5
travis_osx_steps.sh
travis_osx_steps.sh
+8
-0
No files found.
README.rst
View file @
8a61f1f3
...
@@ -342,11 +342,6 @@ To use these scripts
...
@@ -342,11 +342,6 @@ To use these scripts
- MB_PYTHON_VERSION=pypy-5.7
- MB_PYTHON_VERSION=pypy-5.7
before_install:
before_install:
# Setup xcode and compilers to use the new SDK for universal2 and arm64 builds
- if [ "$PLAT" == "universal2" ] || [ "$PLAT" == "arm64" ]; then
sudo xcode-select -switch /Applications/Xcode_12.2.app fi
export SDKROOT=/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
fi
- source multibuild/common_utils.sh
- source multibuild/common_utils.sh
- source multibuild/travis_steps.sh
- source multibuild/travis_steps.sh
- before_install
- before_install
...
...
travis_osx_steps.sh
View file @
8a61f1f3
...
@@ -8,6 +8,14 @@ MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
...
@@ -8,6 +8,14 @@ MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
ENV_VARS_PATH
=
${
ENV_VARS_PATH
:-
env_vars
.sh
}
ENV_VARS_PATH
=
${
ENV_VARS_PATH
:-
env_vars
.sh
}
if
[
"
$PLAT
"
==
"universal2"
]
||
[
"
$PLAT
"
==
"arm64"
]
;
then
if
[
"
$TRAVIS
"
==
"true"
]
;
then
# Setup xcode and compilers to use the new SDK for universal2 and arm64 builds
sudo
xcode-select
-switch
/Applications/Xcode_12.2.app
export
SDKROOT
=
/Applications/Xcode_12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
fi
fi
# These load common_utils.sh
# These load common_utils.sh
source
$MULTIBUILD_DIR
/osx_utils.sh
source
$MULTIBUILD_DIR
/osx_utils.sh
MB_PYTHON_OSX_VER
=
${
MB_PYTHON_OSX_VER
:-
$(
macpython_sdk_for_version
$MB_PYTHON_VERSION
)
}
MB_PYTHON_OSX_VER
=
${
MB_PYTHON_OSX_VER
:-
$(
macpython_sdk_for_version
$MB_PYTHON_VERSION
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment