Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 87fab3d6a548
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d42f502c8480
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 25, 2017

  1. Revert "cc-wrapper: fix darwin" 

    This reverts commit c3a8595.

The stack protector hardening breaks the llvm_4 build.
    @fpletz
    fpletz committed Jun 25, 2017
    Copy the full SHA
    a425264 View commit details

  2. Revert "cc-wrapper: add stackcheck hardening (stack clash)" 

    This reverts commit 4150f5e.

The stack protector hardening breaks the llvm_4 build.
    @fpletz
    fpletz committed Jun 25, 2017
    Copy the full SHA
    d42f502 View commit details
Showing with 2 additions and 6 deletions.
  1. +2 −6 pkgs/build-support/cc-wrapper/add-hardening.sh
8 changes: 2 additions & 6 deletions pkgs/build-support/cc-wrapper/add-hardening.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow stackcheck)
hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow)
hardeningFlags+=("${hardeningEnable[@]}")
hardeningCFlags=()
hardeningLDFlags=()
@@ -50,11 +50,7 @@ if [[ ! $hardeningDisable =~ "all" ]]; then
if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling bindnow >&2; fi
hardeningLDFlags+=('-z' 'now')
;;
stackcheck)
if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackcheck >&2; fi
hardeningCFlags+=('-fstack-check')
;;
*)
*)
echo "Hardening flag unknown: $flag" >&2
;;
esac