Apply special whole-archive linker options only where necessary

PiperOrigin-RevId: 245038294
Change-Id: I99367e7c982a340a88acf730619a467d34d53203
This commit is contained in:
Christian Blichmann 2019-04-24 07:06:48 -07:00 committed by Copybara-Service
parent c6d16a58eb
commit feba2c35d7

View File

@ -54,7 +54,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -97,7 +96,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -116,7 +114,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -129,7 +126,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -160,7 +156,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -173,7 +168,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -186,7 +180,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -199,7 +192,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -212,7 +204,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
deps = [ deps = [
"//sandboxed_api/sandbox2/util:temp_file", "//sandboxed_api/sandbox2/util:temp_file",
@ -240,7 +231,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -252,7 +242,6 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )
@ -264,6 +253,5 @@ cc_binary(
"-pie", "-pie",
"fully_static_link", # link libc statically "fully_static_link", # link libc statically
], ],
linkopts = STATIC_LINKOPTS,
linkstatic = 1, # prefer static libraries linkstatic = 1, # prefer static libraries
) )