From d6e410b3205b6734dbd8640c14841a41782e1d42 Mon Sep 17 00:00:00 2001 From: Pyry Kontio Date: Fri, 14 Jun 2019 17:17:28 +0900 Subject: [PATCH 1/3] Fix rust-lldb wrapper scripts. --- .azure-pipelines/steps/run.yml | 2 +- .travis.yml | 2 +- src/etc/rust-lldb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml index 3f98aa495296a..553ec88a6e188 100644 --- a/.azure-pipelines/steps/run.yml +++ b/.azure-pipelines/steps/run.yml @@ -37,7 +37,7 @@ steps: set -e brew update brew install xz - brew install swig + brew install 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 49a8d5b66c356..549893d7fcc1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -263,7 +263,7 @@ install: if [[ "$SCRIPT" == "./x.py dist" ]]; then travis_retry brew update && travis_retry brew install xz && - travis_retry brew install swig; + travis_retry brew install 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 && diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb index 424302d495f3e..0eb99423df576 100755 --- a/src/etc/rust-lldb +++ b/src/etc/rust-lldb @@ -31,7 +31,7 @@ category_definition="type summary add --no-value --python-function lldb_rust_for category_enable="type category enable Rust" # Call LLDB with the commands added to the argument list -exec "$lldb" --one-line-before-file="$script_import" \ - --one-line-before-file="$category_definition" \ - --one-line-before-file="$category_enable" \ +exec "$lldb" --one-line-before-file "$script_import" \ + --one-line-before-file "$category_definition" \ + --one-line-before-file "$category_enable" \ "$@" From 9d99ae520b74a0ae734851b03bf658b766b4b408 Mon Sep 17 00:00:00 2001 From: Pyry Kontio Date: Sat, 15 Jun 2019 20:00:55 +0900 Subject: [PATCH 2/3] swig@3 is keg-only and not linked by default so add linking so that the build scripts can find it --- .azure-pipelines/steps/run.yml | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml index 553ec88a6e188..271f9d382ff64 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 549893d7fcc1d..20e092e3f91c0 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 && From 2d6e1df51c7a8ebbe642e2c763249f73eb8f4df6 Mon Sep 17 00:00:00 2001 From: Pyry Kontio Date: Sat, 15 Jun 2019 20:17:42 +0900 Subject: [PATCH 3/3] fix syntax --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20e092e3f91c0..3d185b4f0c9ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -263,8 +263,8 @@ install: if [[ "$SCRIPT" == "./x.py dist" ]]; then travis_retry brew update && travis_retry brew install xz && - travis_retry brew install swig@3; - brew link --force swig@3 + 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 &&