Unverified Commit 5cc12aa8 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #182187 from adisbladis/newlib-nano-cc 

newlib-nano: Set same flags as regular newlib in cc-wrapper/gcc config
parents 2be88438 facbbae4

pkgs/build-support/cc-wrapper/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ stdenv.mkDerivation { 
      hardening_unsupported_flags+=" stackprotector fortify"

    '' + optionalString targetPlatform.isAvr ''

      hardening_unsupported_flags+=" stackprotector pic"

    '' + optionalString (targetPlatform.libc == "newlib") ''

    '' + optionalString (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") ''

      hardening_unsupported_flags+=" stackprotector fortify pie pic"

    '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) ''

      hardening_unsupported_flags+=" stackprotector"

pkgs/development/compilers/gcc/common/configure-flags.nix

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ let 
      # In uclibc cases, libgomp needs an additional '-ldl'

      # and as I don't know how to pass it, I disable libgomp.

      "--disable-libgomp"

    ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"

    ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib"

      ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"

    );