diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-07 13:15:34 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-07 15:10:45 -0400 |
| commit | 8b0fce8cb1013837cd2108193653a1763cd68266 (patch) | |
| tree | 9a66438ae3790f203561d354f0c1457da86f39b0 /pkgs/build-support/bintools-wrapper | |
| parent | 2110c0bd3009279ceec291f07bfbf063cb5ba6a0 (diff) | |
| download | nixpkgs-8b0fce8cb1013837cd2108193653a1763cd68266.tar nixpkgs-8b0fce8cb1013837cd2108193653a1763cd68266.tar.gz nixpkgs-8b0fce8cb1013837cd2108193653a1763cd68266.tar.bz2 nixpkgs-8b0fce8cb1013837cd2108193653a1763cd68266.tar.lz nixpkgs-8b0fce8cb1013837cd2108193653a1763cd68266.tar.xz nixpkgs-8b0fce8cb1013837cd2108193653a1763cd68266.tar.zst nixpkgs-8b0fce8cb1013837cd2108193653a1763cd68266.zip | |
{bintools,cc}-wrapper: Factor out role accumulation logic
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/add-flags.sh | 11 | ||||
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index 7d118d20fc6..d02a25fe697 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -11,16 +11,7 @@ var_templates_bool=( NIX+DONT_SET_RPATH ) -declare -a role_infixes=() -if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then - role_infixes+=(_BUILD_) -fi -if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then - role_infixes+=(_) -fi -if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then - role_infixes+=(_TARGET_) -fi +accumulateRoles for var in "${var_templates_list[@]}"; do mangleVarList "$var" "${role_infixes[@]}" diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index c0aea2d1131..bfcd3292729 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -294,7 +294,7 @@ stdenv.mkDerivation { set +u substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${../cc-wrapper/utils.sh} $out/nix-support/utils.sh + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash ## ## Extra custom steps @@ -305,7 +305,7 @@ stdenv.mkDerivation { inherit dynamicLinker expand-response-params; - # for substitution in utils.sh + # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; meta = diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 991ed0fe263..2ad1fdcadc2 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -14,7 +14,7 @@ if [ -n "@coreutils_bin@" ]; then PATH="@coreutils_bin@/bin" fi -source @out@/nix-support/utils.sh +source @out@/nix-support/utils.bash if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then source @out@/nix-support/add-flags.sh |