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: 2f97911566ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e2afa1943a6
Choose a head ref
  • 1 commit
  • 7 files changed
  • 1 contributor

Commits on Nov 9, 2018

  1. gcc/binutils: disable pie hardening 

    These don’t like having -fPIE set for them. We should disable
hardening all the time, but in the interest of not changing hashes,
this only disables it for Musl (where it is now the default).

(cherry picked from commit a3a6884649354a660326acd68c1bd08ffd2dcfa2)
    @matthewbauer
    matthewbauer committed Nov 9, 2018
    1

    Verified

    This commit was signed with the committer’s verified signature.
    Ekleog Léo Gaspard
    GPG key ID: 8A55848B6090F9CF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e2afa1 View commit details
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -180,7 +180,7 @@ stdenv.mkDerivation ({

inherit patches;

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

outputs = [ "out" "lib" "man" "info" ];
setOutputFlags = false;
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.9/default.nix
View file
Original file line number Diff line number Diff line change
@@ -188,7 +188,7 @@ stdenv.mkDerivation ({

inherit patches;

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

outputs = if langJava || langGo then ["out" "man" "info"]
else [ "out" "lib" "man" "info" ];
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -181,7 +181,7 @@ stdenv.mkDerivation ({

libc_dev = stdenv.cc.libc_dev;

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@ stdenv.mkDerivation ({

libc_dev = stdenv.cc.libc_dev;

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -151,7 +151,7 @@ stdenv.mkDerivation ({

libc_dev = stdenv.cc.libc_dev;

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@ stdenv.mkDerivation ({

libc_dev = stdenv.cc.libc_dev;

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
2 changes: 1 addition & 1 deletion pkgs/development/tools/misc/binutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
then "-Wno-string-plus-int -Wno-deprecated-declarations"
else "-static-libgcc";

hardeningDisable = [ "format" ];
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";

# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";