diff options
| author | Ken Micklas <kmicklas@gmail.com> | 2019-04-02 12:45:37 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-10 01:30:34 -0400 |
| commit | f2bb67c8067e40d58630d628607674826fc98735 (patch) | |
| tree | c939378b74c56259256b30ab81b40e56f738bca4 | |
| parent | 11a6d01db6685344d1ef6d1363e2437be3a60614 (diff) | |
| download | nixpkgs-f2bb67c8067e40d58630d628607674826fc98735.tar nixpkgs-f2bb67c8067e40d58630d628607674826fc98735.tar.gz nixpkgs-f2bb67c8067e40d58630d628607674826fc98735.tar.bz2 nixpkgs-f2bb67c8067e40d58630d628607674826fc98735.tar.lz nixpkgs-f2bb67c8067e40d58630d628607674826fc98735.tar.xz nixpkgs-f2bb67c8067e40d58630d628607674826fc98735.tar.zst nixpkgs-f2bb67c8067e40d58630d628607674826fc98735.zip | |
androidndk-pkgs: Fix cc-wrapper flags
(cherry picked from commit 5f4bf240f51124ffa19a5fa0ac48bf144768d9ff)
| -rw-r--r-- | pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index e43dacce625..aa266eb97fe 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -100,8 +100,7 @@ rec { $out/bin/${stdenv.targetPlatform.config}-c++ \ $out/bin/${stdenv.targetPlatform.config}-gcc \ $out/bin/${stdenv.targetPlatform.config}-g++ \ - -e '130i extraBefore+=(-Wl,--fix-cortex-a8)' \ - -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|' + -e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|' '') # GCC 4.9 is the first relase with "-fstack-protector" + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") '' |