forked from rarias/bscpkgs
intel: reorder wrapper isystems
This commit is contained in:
parent
bdbfd77446
commit
8ffb971348
@ -46,6 +46,12 @@ let
|
|||||||
in (wrapCCWith {
|
in (wrapCCWith {
|
||||||
inherit cc;
|
inherit cc;
|
||||||
extraBuildCommands = ''
|
extraBuildCommands = ''
|
||||||
|
# For some reason, If we don't resolve the realpath things go wrong
|
||||||
|
for stddef in ${cc}/lib/clang/*/include/stddef.h ; do
|
||||||
|
dir=$(dirname $(realpath "$stddef"))
|
||||||
|
echo "-isystem $dir" >> $out/nix-support/cc-cflags
|
||||||
|
done
|
||||||
|
|
||||||
echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
|
echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
|
||||||
echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
|
echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
|
||||||
|
|
||||||
@ -68,12 +74,6 @@ let
|
|||||||
# Disable hardening by default
|
# Disable hardening by default
|
||||||
echo "" > $out/nix-support/add-hardening.sh
|
echo "" > $out/nix-support/add-hardening.sh
|
||||||
|
|
||||||
# For some reason, If we don't resolve the realpath things go wrong
|
|
||||||
for stddef in ${cc}/lib/clang/*/include/stddef.h ; do
|
|
||||||
dir=$(dirname $(realpath "$stddef"))
|
|
||||||
echo "-isystem $dir" >> $out/nix-support/cc-cflags
|
|
||||||
done
|
|
||||||
|
|
||||||
'' + extraBuildCommands;
|
'' + extraBuildCommands;
|
||||||
} // (removeAttrs args ["cc" "extraBuildCommands" "extraInstall"])
|
} // (removeAttrs args ["cc" "extraBuildCommands" "extraInstall"])
|
||||||
).overrideAttrs (old: {
|
).overrideAttrs (old: {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user