Skip to content

Commit 475a353

Browse files
meteorcloudycopybara-github
authored andcommitted
Copybara Merge: #275
BEGIN_PUBLIC Copybara import of the project: -- e485793 by Yun Peng <[email protected]>: Use full path for dirname and basename in osx_cc_wrapper.sh.tpl Context: bazelbuild/rules_rust#2998 END_PUBLIC COPYBARA_INTEGRATE_REVIEW=#275 from bazelbuild:meteorcloudy-patch-4 e485793 PiperOrigin-RevId: 697557587 Change-Id: I6ceb3d5f0fd747acb758926750fa48493edbdf3e
1 parent a0e347f commit 475a353

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cc/private/toolchain/osx_cc_wrapper.sh.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ function call_install_name() {
113113
for rpath in ${RPATHS}; do
114114
for lib in ${LIBS}; do
115115
unset libname
116-
if [ -f "$(dirname ${OUTPUT})/${rpath}/lib${lib}.so" ]; then
116+
if [ -f "$(/usr/bin/dirname ${OUTPUT})/${rpath}/lib${lib}.so" ]; then
117117
libname="lib${lib}.so"
118-
elif [ -f "$(dirname ${OUTPUT})/${rpath}/lib${lib}.dylib" ]; then
118+
elif [ -f "$(/usr/bin/dirname ${OUTPUT})/${rpath}/lib${lib}.dylib" ]; then
119119
libname="lib${lib}.dylib"
120120
fi
121121
# ${libname-} --> return $libname if defined, or undefined otherwise. This is to make
@@ -129,8 +129,8 @@ for rpath in ${RPATHS}; do
129129
done
130130
for libpath in ${LIB_PATHS}; do
131131
if [ -f "$libpath" ]; then
132-
libname=$(basename "$libpath")
133-
if [ -f "$(dirname ${OUTPUT})/${rpath}/${libname}" ]; then
132+
libname=$(/usr/bin/basename "$libpath")
133+
if [ -f "$(/usr/bin/dirname ${OUTPUT})/${rpath}/${libname}" ]; then
134134
call_install_name "${libpath}" "${rpath}" "${libname}"
135135
fi
136136
fi

0 commit comments

Comments
 (0)