Permalink
Browse files

Travis: Generalize gen_bridge_metadata fix

Generalize the workaround for the broken gen_bridge_metadata /
bridgesupportparser.bundle since it affects both High Sierra and Mojave.

Decide when to apply the workaround not based on OS_MAJOR but based on
whether gen_bridge_metadata works or not.

See: https://trac.macports.org/ticket/54939
  • Loading branch information...
ryandesign committed Dec 6, 2018
1 parent 85e2647 commit b66d28709bf066163009ac7160ed3bf90a27373e
Showing with 5 additions and 2 deletions.
  1. +5 −2 _ci/bootstrap.sh
@@ -49,5 +49,8 @@ export PATH="/opt/mports/bin:$PATH" && hash -r
curl -fsSLO "https://github.com/macports/mpbot-github/releases/download/v0.0.1/runner"
chmod 0755 runner
# Workaround for an Xcode issue. See https://trac.macports.org/ticket/54939
[ "$OS_MAJOR" = 17 ] && $(cd $(xcode-select -p)/Toolchains && sudo ln -s XcodeDefault.xctoolchain OSX10.13.xctoolchain) || true
# Work around broken gen_bridge_metadata / bridgesupportparser.bundle on High Sierra and Mojave
# See https://trac.macports.org/ticket/54939
if ! /usr/bin/gen_bridge_metadata --version >/dev/null 2>&1; then
sudo ln -s XcodeDefault.xctoolchain "$(xcode-select -p)"/Toolchains/OSX"$(sw_vers -productVersion | cut -d. -f1-2)".xctoolchain
fi

0 comments on commit b66d287

Please sign in to comment.