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.

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 osx_cc_wrapper wrongly treating Mac magic tokens(e.g. @rpath) as parameter files #15070

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions tools/cpp/osx_cc_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ function parse_option() {
# let parse the option list
for i in "$@"; do
if [[ "$i" = @* ]]; then
if [[ "$i" = @executable_path/* ]] \
|| [[ "$i" = @loader_path/* ]] \
|| [[ "$i" = @rpath/* ]]; then
# magic tokens on Mac OS X
parse_option "$i"
continue
fi
while IFS= read -r opt
do
parse_option "$opt"
Expand Down
7 changes: 7 additions & 0 deletions tools/cpp/osx_cc_wrapper.sh.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ function parse_option() {
# let parse the option list
for i in "$@"; do
if [[ "$i" = @* ]]; then
if [[ "$i" = @executable_path/* ]] \
|| [[ "$i" = @loader_path/* ]] \
|| [[ "$i" = @rpath/* ]]; then
# magic tokens on Mac OS X
parse_option "$i"
continue
fi
while IFS= read -r opt
do
parse_option "$opt"
Expand Down