提交 d53115c6 编写于 作者: O Olli-Pekka Heinisuo

unlink and reinstall

上级 21be118b
......@@ -101,14 +101,6 @@ function pre_build {
brew_add_local_bottles
fi
echo 'Installing qt5'
if [ -n "$CACHE_STAGE" ]; then
echo "Qt5 has bottle, no caching needed"
else
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/079ce55db79acc87b91bec950249595b1584e119/Formula/qt.rb
export PATH="/usr/local/opt/qt/bin:$PATH"
fi
echo 'Installing FFmpeg'
if [ -n "$CACHE_STAGE" ]; then
......@@ -118,6 +110,16 @@ function pre_build {
brew install ffmpeg_opencv
fi
echo 'Installing qt5'
if [ -n "$CACHE_STAGE" ]; then
echo "Qt5 has bottle, no caching needed"
else
brew unlink qt
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/079ce55db79acc87b91bec950249595b1584e119/Formula/qt.rb
export PATH="/usr/local/opt/qt/bin:$PATH"
fi
if [ -n "$CACHE_STAGE" ]; then
brew_go_bootstrap_mode 0
return 0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册