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

cc-wrapper: fix wrapper tests and building for darwin on staging-next #107336

Closed
wants to merge 3 commits into from
Closed

cc-wrapper: fix wrapper tests and building for darwin on staging-next #107336

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6584a3
cc-wrapper: disable dynamic linker for darwin
Emantor Dec 21, 2020
708cb80
cc-wrapper: useGccForLibs for libcxx == null
Emantor Dec 21, 2020
7b4f7da
fixup! cc-wrapper: disable dynamic linker for darwin
Emantor Dec 21, 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: 4 additions & 0 deletions pkgs/build-support/cc-wrapper/cc-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ cppInclude=1
cInclude=1
setDynamicLinker=1

if [[ "@isdarwin@" = "1" ]]; then
setDynamicLinker=0
fi

expandResponseParams "$@"
declare -i n=0
nParams=${#params[@]}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/cc-wrapper/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ let
else "";

useGccForLibs = isClang
&& libcxx == null
&& !(stdenv.targetPlatform.useLLVM or false)
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
&& gccForLibs != null;
Expand Down Expand Up @@ -154,6 +153,7 @@ stdenv.mkDerivation {
local dst="$1"
local wrapper="$2"
export prog="$3"
export isdarwin="${toString targetPlatform.isDarwin or false}"
vcunat marked this conversation as resolved.
Show resolved Hide resolved
substituteAll "$wrapper" "$out/bin/$dst"
chmod +x "$out/bin/$dst"
}
Expand Down