Skip to content

cc-wrapper: keep machine cflags if the same target is passed #391944

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

Merged
alyssais merged 2 commits into from
Mar 28, 2025
Merged

cc-wrapper: keep machine cflags if the same target is passed #391944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2a5e24
cc-wrapper: rename $needsTarget -> $targetPassed
mildsunrise Mar 27, 2025
220608b
cc-wrapper: keep local cflags if the same target is passed
mildsunrise Mar 27, 2025
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
12 changes: 5 additions & 7 deletions pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
needsTarget=true
targetPassed=false
targetValue=""

declare -i n=0
Expand All @@ -14,22 +14,20 @@ while (("$n" < "$nParams")); do
echo "Error: -target requires an argument" >&2
exit 1
fi
needsTarget=false
targetPassed=true
targetValue=$v
# skip parsing the value of -target
n+=1
;;
--target=*)
needsTarget=false
targetPassed=true
targetValue="${p#*=}"
;;
esac
done

if ! $needsTarget && [[ "$targetValue" != "@defaultTarget@" ]]; then
if $targetPassed && [[ "$targetValue" != "@defaultTarget@" ]]; then
echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2
fi

if $needsTarget && [[ $0 != *cpp ]]; then
elif [[ $0 != *cpp ]]; then
extraBefore+=(-target @defaultTarget@ @machineFlags@)
fi