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

Jump to bottom

[6.1.0]Use xcrun to invoke install_name_tool #17253

Merged
merged 3 commits into from
Jan 19, 2023
Merged

[6.1.0]Use xcrun to invoke install_name_tool #17253

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc9f657
Use xcrun to invoke install_name_tool
keith Jan 12, 2023
00ef344
Merge branch 'release-6.1.0' into ks/cherry-pick16951
ShreeM01 Jan 19, 2023
8939dc3
Merge branch 'release-6.1.0' into ks/cherry-pick16951
ShreeM01 Jan 19, 2023
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: 1 addition & 3 deletions tools/cpp/osx_cc_wrapper.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#
set -eu

INSTALL_NAME_TOOL="/usr/bin/install_name_tool"

LIBS=
LIB_DIRS=
RPATHS=
Expand Down Expand Up @@ -110,7 +108,7 @@ for rpath in ${RPATHS}; do
if [[ -n "${libname-}" ]]; then
libpath=$(get_library_path ${lib})
if [ -n "${libpath}" ]; then
${INSTALL_NAME_TOOL} -change $(get_otool_path "${libpath}") \
/usr/bin/xcrun install_name_tool -change $(get_otool_path "${libpath}") \
"@loader_path/${rpath}/${libname}" "${OUTPUT}"
fi
fi
Expand Down