@@ -129,16 +129,6 @@ def _platform_copts(rule_copts, rule_gcc_copts, rule_clang_copts, cc_test = 0):
129
129
"//conditions:default" : [],
130
130
})
131
131
132
- # The BASE_LINKOPTS are used for all drake_cc_{binary,library,test} rules.
133
- BASE_LINKOPTS = select ({
134
- "@drake//tools/cc_toolchain:use_mold_linker" : [
135
- "-fuse-ld=mold" ,
136
- "-Wl,--compress-debug-sections=zlib" ,
137
- "-Wl,--thread-count=2" ,
138
- ],
139
- "//conditions:default" : [],
140
- })
141
-
142
132
def _check_library_deps_blacklist (name , deps ):
143
133
"""Report an error if a library should not use something from deps."""
144
134
if not deps :
@@ -606,7 +596,6 @@ def drake_cc_library(
606
596
copts = [],
607
597
clang_copts = [],
608
598
gcc_copts = [],
609
- linkopts = [],
610
599
linkstatic = 1 ,
611
600
internal = False ,
612
601
compile_once_per_scalar = False ,
@@ -660,7 +649,6 @@ def drake_cc_library(
660
649
should be surrounded with `#if DRAKE_ONCE_PER_SCALAR_PHASE == 0`.
661
650
"""
662
651
new_copts = _platform_copts (copts , gcc_copts , clang_copts )
663
- new_linkopts = BASE_LINKOPTS + linkopts
664
652
new_tags = kwargs .pop ("tags" , None ) or []
665
653
if internal :
666
654
if install_hdrs_exclude != []:
@@ -702,7 +690,6 @@ def drake_cc_library(
702
690
deps = deps + add_deps ,
703
691
implementation_deps = implementation_deps ,
704
692
copts = new_copts ,
705
- linkopts = new_linkopts ,
706
693
linkstatic = linkstatic ,
707
694
declare_installed_headers = declare_installed_headers ,
708
695
install_hdrs_exclude = install_hdrs_exclude ,
@@ -796,13 +783,11 @@ def drake_cc_binary(
796
783
defaults using test_rule_args=["-f", "--bar=42"] or test_rule_size="baz".
797
784
"""
798
785
new_copts = _platform_copts (copts , gcc_copts , clang_copts )
799
- new_linkopts = BASE_LINKOPTS + linkopts
800
786
new_srcs , add_deps = _maybe_add_pruned_private_hdrs_dep (
801
787
base_name = name ,
802
788
srcs = srcs ,
803
789
deps = deps ,
804
790
copts = new_copts ,
805
- linkopts = new_linkopts ,
806
791
testonly = testonly ,
807
792
** kwargs
808
793
)
@@ -816,7 +801,7 @@ def drake_cc_binary(
816
801
testonly = testonly ,
817
802
linkshared = linkshared ,
818
803
linkstatic = linkstatic ,
819
- linkopts = new_linkopts ,
804
+ linkopts = linkopts ,
820
805
features = [
821
806
# We should deduplicate symbols while linking (for a ~6% reduction
822
807
# in disk use), to conserve space in CI; see #18545 for details.
@@ -835,7 +820,6 @@ def drake_cc_binary(
835
820
data = data + test_rule_data ,
836
821
deps = deps + add_deps ,
837
822
copts = copts ,
838
- linkopts = new_linkopts ,
839
823
gcc_copts = gcc_copts ,
840
824
size = test_rule_size ,
841
825
timeout = test_rule_timeout ,
@@ -855,7 +839,6 @@ def drake_cc_test(
855
839
copts = [],
856
840
gcc_copts = [],
857
841
clang_copts = [],
858
- linkopts = [],
859
842
allow_network = None ,
860
843
display = False ,
861
844
num_threads = None ,
@@ -885,13 +868,11 @@ def drake_cc_test(
885
868
kwargs = incorporate_display (kwargs , display = display )
886
869
kwargs = incorporate_num_threads (kwargs , num_threads = num_threads )
887
870
new_copts = _platform_copts (copts , gcc_copts , clang_copts , cc_test = 1 )
888
- new_linkopts = BASE_LINKOPTS + linkopts
889
871
new_srcs , add_deps = _maybe_add_pruned_private_hdrs_dep (
890
872
base_name = name ,
891
873
srcs = srcs ,
892
874
deps = deps ,
893
875
copts = new_copts ,
894
- linkopts = new_linkopts ,
895
876
** kwargs
896
877
)
897
878
cc_test (
@@ -901,7 +882,6 @@ def drake_cc_test(
901
882
args = args ,
902
883
deps = deps + add_deps ,
903
884
copts = new_copts ,
904
- linkopts = new_linkopts ,
905
885
features = [
906
886
# We should deduplicate symbols while linking (for a ~6% reduction
907
887
# in disk use), to conserve space in CI; see #18545 for details.
0 commit comments