Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni 2index 80e2a362a..df138c87b 100644 3--- a/build/toolchain/gcc_toolchain.gni 4+++ b/build/toolchain/gcc_toolchain.gni 5@@ -355,6 +355,8 @@ template("gcc_toolchain") { 6 # AIX does not support either -D (deterministic output) or response 7 # files. 8 command = "$ar -X64 {{arflags}} -r -c -s {{output}} {{inputs}}" 9+ } else if (current_os == "mac") { 10+ command = "$ar {{arflags}} -r -c -s {{output}} {{inputs}}" 11 } else { 12 rspfile = "{{output}}.rsp" 13 rspfile_content = "{{inputs}}" 14@@ -546,7 +548,7 @@ template("gcc_toolchain") { 15 16 start_group_flag = "" 17 end_group_flag = "" 18- if (current_os != "aix") { 19+ if (current_os != "aix" && current_os != "mac") { 20 # the "--start-group .. --end-group" feature isn't available on the aix ld. 21 start_group_flag = "-Wl,--start-group" 22 end_group_flag = "-Wl,--end-group "