From f2bb67c8067e40d58630d628607674826fc98735 Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Tue, 2 Apr 2019 12:45:37 -0400 Subject: [PATCH] androidndk-pkgs: Fix cc-wrapper flags (cherry picked from commit 5f4bf240f51124ffa19a5fa0ac48bf144768d9ff) --- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 3 +-- 1 file changed, 1 insertion(+), 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") ''