diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 12:18:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-13 13:04:25 +0200 |
| commit | 01ad208333f7467e906dfaf0b56be50cb6945f95 (patch) | |
| tree | 362fd4cb43cedbfe0f34a15b2d711b6d02b15ae2 /coin/provisioning/common/macos/libiodbc.sh | |
| parent | 6762ccb18664aee9e50b05a9d49042477405b9bb (diff) | |
| parent | 39a9e58888b19d4ad6e821b2498d85121b283c6c (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
This change partially reverts 24f0367a60fdd3379014e507fa7f4553d433c601.
Conflicts:
coin/platform_configs/default.yaml
SLES 12 got removed temporarily.
Task-number: QTQAINFRA-2851
Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
Diffstat (limited to 'coin/provisioning/common/macos/libiodbc.sh')
| -rwxr-xr-x | coin/provisioning/common/macos/libiodbc.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 79fa86c2..4ba0bbc3 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -41,7 +41,7 @@ set -ex 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 |