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

coreutils: remove conflicting _FORTIFY_SOURCE definition

Browse Source 
Originally this was introduced in 055e646b ('coreutils: Guard against compiler not supporting __builtin_stpncpy_chk') four years ago. Right now this doesn't seem to serve any purpose and it conflicts with the hardening flags:

    <command line>:2:9: warning: '_FORTIFY_SOURCE' macro redefined [-Wmacro-redefined]
    #define _FORTIFY_SOURCE 2
            ^
    <command line>:1:9: note: previous definition is here
    #define _FORTIFY_SOURCE 0
            ^
    1 warning generated.
This commit is contained in:
Dmitry Kalinkin 2017-09-19 01:41:01 -04:00
parent cbdd77f791
commit 5ae7445530
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/misc/coreutils/default.nix
View File

@ -76,8 +76,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1"; FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1";
makeFlags = optionalString hostPlatform.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
# Works around a bug with 8.26: # Works around a bug with 8.26:
# Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop.
preInstall = optionalString (hostPlatform != buildPlatform) '' preInstall = optionalString (hostPlatform != buildPlatform) ''