diff options
| author |  dmarting <dmarting@google.com> | 2017-05-02 15:30:23 +0200 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2017-05-02 15:44:41 +0200 |
| commit | 5fc036efd389e99470b7a9c45c1db87834675f68 (patch) | |
| tree | 9e8a3ca1615447638789f51972f0abf8ff314473 /tools/objc | |
| parent | 7beadb7277453efec7e12b925005e7f0e003b592 (diff) | |
Automated g4 rollback of commit 5038016e6573962d2554fcf9c10faa0cca8714e2.
*** Reason for rollback ***
Broke rules_go and all its dependencies:
http://ci.bazel.io/job/rules_web/BAZEL_VERSION=HEAD,PLATFORM_NAME=darwin-x86_64/464/console
http://ci.bazel.io/job/rules_go/BAZEL_VERSION=HEAD,PLATFORM_NAME=darwin-x86_64/823/console
http://ci.bazel.io/job/buildifier/BAZEL_VERSION=HEAD,PLATFORM_NAME=darwin-x86_64/557/console
Bisected with `bazel build ...` in rules_go
The error message is still -whole-archive appearing in rules_go.
*** Original change description ***
Rollforward of: Basic open-source crosstool to support targeting apple platform types.
RELNOTES: None.
PiperOrigin-RevId: 154825240
Diffstat (limited to 'tools/objc')
| -rwxr-xr-x | tools/objc/libtool.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/objc/libtool.sh b/tools/objc/libtool.sh index e1275758ea..5ad89a019d 100755 --- a/tools/objc/libtool.sh +++ b/tools/objc/libtool.sh @@ -23,15 +23,7 @@ set -eu -# A trick to allow invoking this script in multiple contexts. -if [ -z ${MY_LOCATION+x} ]; then - if [ -d "$0.runfiles/" ]; then - MY_LOCATION="$0.runfiles/bazel_tools/tools/objc" - else - MY_LOCATION="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" - fi -fi - +MY_LOCATION=${MY_LOCATION:-"$0.runfiles/bazel_tools/tools/objc"} WRAPPER="${MY_LOCATION}/xcrunwrapper.sh" # Creates a symbolic link to the input argument file and returns the symlink |