diff --git a/bp2build/cc_library_static_conversion_test.go b/bp2build/cc_library_static_conversion_test.go index 72034faaa..91b7478be 100644 --- a/bp2build/cc_library_static_conversion_test.go +++ b/bp2build/cc_library_static_conversion_test.go @@ -202,7 +202,6 @@ cc_library_static { ":static_lib_1", ":static_lib_2", ], - linkstatic = True, local_includes = [ "local_include_dir_1", "local_include_dir_2", @@ -251,7 +250,6 @@ cc_library_static { expectedBazelTargets: []string{`cc_library_static( name = "foo_static", absolute_includes = ["subpackage"], - linkstatic = True, local_includes = ["."], )`}, }) @@ -278,7 +276,6 @@ cc_library_static { expectedBazelTargets: []string{`cc_library_static( name = "foo_static", export_includes = ["subpackage"], - linkstatic = True, )`}, }) } @@ -304,7 +301,6 @@ cc_library_static { expectedBazelTargets: []string{`cc_library_static( name = "foo_static", export_system_includes = ["subpackage"], - linkstatic = True, )`}, }) } @@ -347,7 +343,6 @@ cc_library_static { "subpackage3/subsubpackage", ], export_includes = ["./exported_subsubpackage"], - linkstatic = True, local_includes = [ "subsubpackage2", ".", @@ -378,7 +373,6 @@ cc_library_static { expectedBazelTargets: []string{`cc_library_static( name = "foo_static", absolute_includes = ["subpackage"], - linkstatic = True, local_includes = ["subpackage2"], )`}, }) @@ -408,7 +402,6 @@ cc_library_static { expectedBazelTargets: []string{`cc_library_static( name = "foo_static", absolute_includes = ["subpackage"], - linkstatic = True, local_includes = [ "subpackage2", ".", @@ -444,7 +437,6 @@ cc_library_static { "//build/bazel/platforms/arch:arm64": [":static_dep"], "//conditions:default": [], }), - linkstatic = True, whole_archive_deps = select({ "//build/bazel/platforms/arch:arm64": [":static_dep2"], "//conditions:default": [], @@ -480,7 +472,6 @@ cc_library_static { "//build/bazel/platforms/os:android": [":static_dep"], "//conditions:default": [], }), - linkstatic = True, whole_archive_deps = select({ "//build/bazel/platforms/os:android": [":static_dep2"], "//conditions:default": [], @@ -530,7 +521,6 @@ cc_library_static { "//build/bazel/platforms/os:android": [":static_dep3"], "//conditions:default": [], }), - linkstatic = True, whole_archive_deps = [":static_dep2"], )`}, }) @@ -556,7 +546,6 @@ cc_library_static { }`, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs_c = [ "common.c", "foo-a.c", @@ -584,7 +573,6 @@ cc_library_static { }`, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs_c = ["common.c"] + select({ "//build/bazel/platforms/arch:arm": ["foo-arm.c"], "//conditions:default": [], @@ -617,7 +605,6 @@ cc_library_static { }`, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs_c = ["common.c"] + select({ "//build/bazel/platforms/arch:arm": ["for-arm.c"], "//conditions:default": ["not-for-arm.c"], @@ -652,7 +639,6 @@ cc_library_static { } `, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs_c = ["common.c"] + select({ "//build/bazel/platforms/arch:arm": [ "for-arm.c", @@ -703,7 +689,6 @@ cc_library_static { } `, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs_c = ["common.c"] + select({ "//build/bazel/platforms/arch:arm": [ "for-arm.c", @@ -763,7 +748,6 @@ cc_library_static { }`, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs = ["common.cc"] + select({ "//build/bazel/platforms/arch:arm": [], "//conditions:default": ["foo-no-arm.cc"], @@ -797,7 +781,6 @@ cc_library_static { }`, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs = ["common.cc"] + select({ "//build/bazel/platforms/arch:arm": [], "//build/bazel/platforms/arch:x86": [ @@ -830,7 +813,6 @@ cc_library_static { expectedBazelTargets: []string{`cc_library_static( name = "foo_static", implementation_deps = [":static_dep"], - linkstatic = True, )`}, }) } @@ -857,7 +839,6 @@ cc_library_static { } `, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs_c = ["common.c"] + select({ "//build/bazel/platforms/arch:arm": ["for-lib32.c"], "//build/bazel/platforms/arch:x86": ["for-lib32.c"], @@ -892,7 +873,6 @@ cc_library_static { } `, expectedBazelTargets: []string{`cc_library_static( name = "foo_static2", - linkstatic = True, srcs_c = ["common.c"] + select({ "//build/bazel/platforms/arch:arm": [ "for-lib32.c", @@ -960,7 +940,6 @@ cc_library_static { }`, expectedBazelTargets: []string{`cc_library_static( name = "foo_static3", - linkstatic = True, srcs_c = ["common.c"] + select({ "//build/bazel/platforms/arch:arm": [ "for-arm.c", @@ -1075,7 +1054,6 @@ cc_library_static { `, expectedBazelTargets: []string{`cc_library_static( name = "foo_static3", - linkstatic = True, srcs = [ "//dep:generated_hdr_other_pkg", "//dep:generated_src_other_pkg", @@ -1131,7 +1109,6 @@ cc_library_static { }`, expectedBazelTargets: []string{`cc_library_static( name = "foo_static", - linkstatic = True, srcs_c = select({ "//build/bazel/platforms/os:android": ["android_src.c"], "//conditions:default": [], @@ -1183,7 +1160,6 @@ cc_library_static { "//build/bazel/product_variables:malloc_zero_contents": ["-Wmalloc_zero_contents"], "//conditions:default": [], }), - linkstatic = True, srcs_c = ["common.c"], )`}, }) @@ -1252,7 +1228,6 @@ cc_library_static { "//build/bazel/product_variables:malloc_not_svelte-x86": ["-Wlib32_malloc_not_svelte"], "//conditions:default": [], }), - linkstatic = True, srcs_c = ["common.c"], )`}, }) @@ -1282,7 +1257,6 @@ cc_library_static { "//build/bazel/product_variables:platform_sdk_version": ["-DPLATFORM_SDK_VERSION=$(Platform_sdk_version)"], "//conditions:default": [], }), - linkstatic = True, srcs_as = ["common.S"], )`}, }) @@ -1303,7 +1277,6 @@ cc_library_static { `, expectedBazelTargets: []string{`cc_library_static( name = "root_empty", - linkstatic = True, system_dynamic_deps = [], )`}, }) @@ -1330,7 +1303,6 @@ cc_library_static { `, expectedBazelTargets: []string{`cc_library_static( name = "static_empty", - linkstatic = True, system_dynamic_deps = [], )`}, }) @@ -1355,7 +1327,6 @@ cc_library_static { `, expectedBazelTargets: []string{`cc_library_static( name = "target_bionic_empty", - linkstatic = True, system_dynamic_deps = [], )`}, }) @@ -1384,7 +1355,6 @@ cc_library_static { `, expectedBazelTargets: []string{`cc_library_static( name = "target_linux_bionic_empty", - linkstatic = True, system_dynamic_deps = [], )`}, }) @@ -1411,7 +1381,6 @@ cc_library_static { `, expectedBazelTargets: []string{`cc_library_static( name = "target_bionic", - linkstatic = True, system_dynamic_deps = select({ "//build/bazel/platforms/os:bionic": [":libc"], "//conditions:default": [], @@ -1443,7 +1412,6 @@ cc_library_static { `, expectedBazelTargets: []string{`cc_library_static( name = "target_linux_bionic", - linkstatic = True, system_dynamic_deps = [":libc"] + select({ "//build/bazel/platforms/os:linux_bionic": [":libm"], "//conditions:default": [], diff --git a/cc/library.go b/cc/library.go index f56824706..7caec9d25 100644 --- a/cc/library.go +++ b/cc/library.go @@ -2332,7 +2332,6 @@ type bazelCcLibraryStaticAttributes struct { Dynamic_deps bazel.LabelListAttribute System_dynamic_deps bazel.LabelListAttribute Linkopts bazel.StringListAttribute - Linkstatic bool Use_libcrt bazel.BoolAttribute Rtti bazel.BoolAttribute Export_includes bazel.StringListAttribute