Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue where libtool_check_unique isn't found for sandbox builds #12046

Closed
wants to merge 4 commits into from
Closed

Fix issue where libtool_check_unique isn't found for sandbox builds #12046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0060a4f
Add libtool check unique to tools list
michaeleisel Sep 4, 2020
b769b89
Add libtool check unique to tools list
michaeleisel Sep 9, 2020
b9261d2
Add libtool check unique to tools list
michaeleisel Sep 9, 2020
5d27d7f
Add libtool check unique to tools list
michaeleisel Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tools/objc/libtool.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ WRAPPER="${MY_LOCATION}/xcrunwrapper.sh"
# Ensure 0 timestamping for hermetic results.
export ZERO_AR_DATE=1

if "${MY_LOCATION}"/libtool_check_unique "$@"; then
if [ ! -f "${MY_LOCATION}"/libtool_check_unique ] ; then
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bash is not fantastic, but this at least works for me

echo "libtool_check_unique not found. Please file an issue at github.com/bazelbuild/bazel"
elif "${MY_LOCATION}"/libtool_check_unique "$@"; then
# If there are no duplicate .o basenames,
# libtool can be invoked with the original arguments.
"${WRAPPER}" libtool "$@"
Expand Down
1 change: 1 addition & 0 deletions tools/osx/crosstool/BUILD.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ cc_toolchain_suite(
":builtin_include_directory_paths",
":cc_wrapper",
":libtool",
":libtool_check_unique",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on this one, seems like this label references the binary in the toolchain setup

":make_hashed_objlist.py",
":wrapped_clang",
":wrapped_clang_pp",
Expand Down