Fix autodetection of -z linker flags

hlopko · laurentlb · commit 4e190ba6be67 · 2018-07-17T13:25:33.000+02:00
Clang reports missing -Wl,-z,relro as "ld: unknwon option: -z"). This cl fixes the autodetection to expect the short variant. Fixes #5468. RELNOTES: NONE. PiperOrigin-RevId: 203449206
diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
@@ -275,7 +275,7 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin):
             repository_ctx,
             cc,
             "-Wl,-z,relro,-z,now",
-            "-z,relro,-z,now",
+            "-z",
         ) + (
             [
                 "-undefined",

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ def _crosstool_content(repository_ctx, cc, cpu_value, darwin):`
`275`	`275`	`repository_ctx,`
`276`	`276`	`cc,`
`277`	`277`	`"-Wl,-z,relro,-z,now",`
`278`		`- "-z,relro,-z,now",`
	`278`	`+ "-z",`
`279`	`279`	`) + (`
`280`	`280`	`[`
`281`	`281`	`"-undefined",`