JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hardening: initial cross support

Browse Source
This commit is contained in:
Charles Strahan 2018-03-06 18:03:13 -05:00
parent fc46895e86
commit 634c748050
No known key found for this signature in database
GPG Key ID: BB47AB4B8489B5A5
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/bintools-wrapper/add-flags.sh
View File

@ -24,10 +24,10 @@ if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then
fi fi
for var in "${var_templates_list[@]}"; do for var in "${var_templates_list[@]}"; do
mangleVarList "$var" "${role_infixes[@]}" mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done done
for var in "${var_templates_bool[@]}"; do for var in "${var_templates_bool[@]}"; do
mangleVarBool "$var" "${role_infixes[@]}" mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done done
if [ -e @out@/nix-support/libc-ldflags ]; then if [ -e @out@/nix-support/libc-ldflags ]; then

5
pkgs/build-support/cc-wrapper/add-flags.sh
View File

@ -10,6 +10,7 @@ var_templates_list=(
NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_COMPILE
NIX+CXXSTDLIB_LINK NIX+CXXSTDLIB_LINK
NIX+GNATFLAGS_COMPILE NIX+GNATFLAGS_COMPILE
NIX+HARDENING_ENABLE
) )
var_templates_bool=( var_templates_bool=(
NIX+ENFORCE_NO_NATIVE NIX+ENFORCE_NO_NATIVE
@ -31,10 +32,10 @@ fi
# We need to mangle names for hygiene, but also take parameters/overrides # We need to mangle names for hygiene, but also take parameters/overrides
# from the environment. # from the environment.
for var in "${var_templates_list[@]}"; do for var in "${var_templates_list[@]}"; do
mangleVarList "$var" "${role_infixes[@]}" mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done done
for var in "${var_templates_bool[@]}"; do for var in "${var_templates_bool[@]}"; do
mangleVarBool "$var" "${role_infixes[@]}" mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"}
done done
# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.

2
pkgs/build-support/cc-wrapper/add-hardening.sh
View File

@ -6,7 +6,7 @@ declare -A hardeningEnableMap=()
# Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The # Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The
# array expansion also prevents undefined variables from causing trouble with # array expansion also prevents undefined variables from causing trouble with
# `set -u`. # `set -u`.
for flag in ${NIX_HARDENING_ENABLE-}; do for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do
hardeningEnableMap[$flag]=1 hardeningEnableMap[$flag]=1
done done

3
pkgs/build-support/cc-wrapper/cc-wrapper.sh
View File

@ -135,7 +135,8 @@ source @out@/nix-support/add-hardening.sh
# Add the flags for the C compiler proper. # Add the flags for the C compiler proper.
extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE) extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE)
extraBefore=("${hardeningCFlags[@]}")
extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"})
if [ "$dontLink" != 1 ]; then if [ "$dontLink" != 1 ]; then