diff options
| author | Pyry Kontio <pyry.kontio@drasa.eu> | 2019-06-15 20:00:55 +0900 |
|---|---|---|
| committer | Pyry Kontio <pyry.kontio@drasa.eu> | 2019-06-16 01:51:32 +0900 |
| commit | 9d99ae520b74a0ae734851b03bf658b766b4b408 (patch) | |
| tree | 572536cea24edfd4d0e4313deb30de0af7bf645a | |
| parent | d6e410b3205b6734dbd8640c14841a41782e1d42 (diff) | |
| download | rust-9d99ae520b74a0ae734851b03bf658b766b4b408.tar.gz rust-9d99ae520b74a0ae734851b03bf658b766b4b408.zip | |
swig@3 is keg-only and not linked by default so add linking so that the build scripts can find it
| -rw-r--r-- | .azure-pipelines/steps/run.yml | 1 | ||||
| -rw-r--r-- | .travis.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml index 553ec88a6e1..271f9d382ff 100644 --- a/.azure-pipelines/steps/run.yml +++ b/.azure-pipelines/steps/run.yml @@ -38,6 +38,7 @@ steps: brew update brew install xz brew install swig@3 + brew link --force swig@3 displayName: Install build dependencies (OSX) condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'), eq(variables['SCRIPT'],'./x.py dist')) diff --git a/.travis.yml b/.travis.yml index 549893d7fcc..20e092e3f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -264,6 +264,7 @@ install: travis_retry brew update && travis_retry brew install xz && travis_retry brew install swig@3; + brew link --force swig@3 fi && travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin && chmod +x /usr/local/bin/sccache && |