From 335d0097cfad5dbda85a810b44be7d88082a036d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 23 Aug 2016 15:17:32 +0000 Subject: [PATCH] cc-wrapper: add-{flags,hardening} -> add-{flags,hardening}.sh --- pkgs/build-support/cc-wrapper/{add-flags => add-flags.sh} | 0 .../cc-wrapper/{add-hardening => add-hardening.sh} | 0 pkgs/build-support/cc-wrapper/default.nix | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/build-support/cc-wrapper/{add-flags => add-flags.sh} (100%) rename pkgs/build-support/cc-wrapper/{add-hardening => add-hardening.sh} (100%) diff --git a/pkgs/build-support/cc-wrapper/add-flags b/pkgs/build-support/cc-wrapper/add-flags.sh similarity index 100% rename from pkgs/build-support/cc-wrapper/add-flags rename to pkgs/build-support/cc-wrapper/add-flags.sh diff --git a/pkgs/build-support/cc-wrapper/add-hardening b/pkgs/build-support/cc-wrapper/add-hardening.sh similarity index 100% rename from pkgs/build-support/cc-wrapper/add-hardening rename to pkgs/build-support/cc-wrapper/add-hardening.sh diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 14ece26f6af..10bd5f77f72 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -237,8 +237,8 @@ stdenv.mkDerivation { cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook rm $out/nix-support/setup-hook.tmp - substituteAll ${./add-flags} $out/nix-support/add-flags.sh - cp -p ${./add-hardening} $out/nix-support/add-hardening.sh + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh + cp -p ${./add-hardening.sh} $out/nix-support/add-hardening.sh cp -p ${./utils.sh} $out/nix-support/utils.sh '' + extraBuildCommands;