diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-03 14:40:41 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-03 14:40:41 +0200 |
commit | 2d577a83ecdcddcfbdf52dc01984e9313ad8b898 (patch) | |
tree | 5df9b21074008c86a82fd849286dd236900fcf09 /coin/provisioning/common/macos/libiodbc.sh | |
parent | 52068b49e837ec840ef3fe14a7da21268fbc6cd5 (diff) | |
parent | ec7bf6356ccbdaf14f5274e36f49d73013fc5a06 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
Change-Id: I34cf4fb6818c17872e55f36149e8f91871d2aea1
Diffstat (limited to 'coin/provisioning/common/macos/libiodbc.sh')
-rwxr-xr-x | coin/provisioning/common/macos/libiodbc.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 79fa86c2..d620c71d 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -40,8 +40,7 @@ set -ex # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew update -brew install libiodbc +brew install ${BASH_SOURCE%/*}/libiodbc.rb # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc |