diff options
| author | der richter <der.richter@gmx.de> | 2020-11-18 23:31:59 +0100 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2020-11-22 13:44:16 +0200 |
| commit | 5ae6f04d6bb3647419b02e0e0f4d8198b9e44bb2 (patch) | |
| tree | d0a5fbc5d5fb17ebd7125b720c6292a1be7d9675 /ci | |
| parent | 959097c880d9dcf83cb2edbdf8a2403ae997f713 (diff) | |
| download | mpv-5ae6f04d6bb3647419b02e0e0f4d8198b9e44bb2.tar.bz2 mpv-5ae6f04d6bb3647419b02e0e0f4d8198b9e44bb2.tar.xz | |
build: fix macOS arm builds
remove the hardcoded swift target version and move the version
restriction to configure. this was a bad idea anyway and could lead to
mismatched object files between obj-c and swift. fix travis 10.12 legacy
build.
also update the SDK version parser to handle the new macOS 11 scheme.
Fixes #8281
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-macos.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/build-macos.sh b/ci/build-macos.sh index 347a75160f..cf3fbb3509 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -19,7 +19,8 @@ PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" pytho --variant="${MPV_VARIANT}" \ --prefix="${MPV_INSTALL_PREFIX}" \ --enable-{gl,iconv,lcms2,libmpv-shared,lua,jpeg,plain-gl,zlib} \ - --enable-{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl} + --enable-{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl} \ + --swift-flags="${CI_SWIFT_FLAGS}" python3 ./waf build --variant="${MPV_VARIANT}" -j4 |