Skip to content

Commit 729f164

Browse files
committed
fix logic
1 parent 27dd4d1 commit 729f164

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Diff for: cc/BUILD.bazel

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ exports_files(
1616
visibility = ["//visibility:public"],
1717
)
1818

19-
# Disable tests and test libraries with --@rules_swiftnav//:disable_test=true
19+
# Disable tests and test libraries with --@rules_swiftnav///cc:disable_test=true
2020
bool_flag(
2121
name = "disable_tests",
2222
build_setting_default = False,
@@ -29,7 +29,7 @@ config_setting(
2929
visibility = ["//visibility:public"],
3030
)
3131

32-
# Enable exceptions with --@rules_swiftnav//:enable_exceptions=true
32+
# Enable exceptions with --@rules_swiftnav//cc:enable_exceptions=true
3333
bool_flag(
3434
name = "enable_exceptions",
3535
build_setting_default = False,
@@ -42,7 +42,7 @@ config_setting(
4242
visibility = ["//visibility:public"],
4343
)
4444

45-
# Enable rtti with --@rules_swiftnav//:enable_exceptions=true
45+
# Enable rtti with --@rules_swiftnav//cc:enable_exceptions=true
4646
bool_flag(
4747
name = "enable_rtti",
4848
build_setting_default = False,
@@ -55,6 +55,7 @@ config_setting(
5555
visibility = ["//visibility:public"],
5656
)
5757

58+
# Enable shared linking with --@rules_swiftnav//cc:enable_shared=true
5859
bool_flag(
5960
name = "enable_shared",
6061
build_setting_default = False,
@@ -87,21 +88,21 @@ string_flag(
8788
visibility = ["//visibility:public"],
8889
)
8990

90-
# Enable with --@rules_swiftnav//:cxx_standard=17
91+
# Enable with --@rules_swiftnav//cc:cxx_standard=17
9192
config_setting(
9293
name = "cxx17",
9394
flag_values = {":cxx_standard": "17"},
9495
visibility = ["//visibility:public"],
9596
)
9697

97-
# Enable with --@rules_swiftnav//:cxx_standard=20
98+
# Enable with --@rules_swiftnav//cc:cxx_standard=20
9899
config_setting(
99100
name = "cxx20",
100101
flag_values = {":cxx_standard": "20"},
101102
visibility = ["//visibility:public"],
102103
)
103104

104-
# Enable with --@rules_swiftnav//:cxx_standard=23
105+
# Enable with --@rules_swiftnav//cc:cxx_standard=23
105106
config_setting(
106107
name = "cxx23",
107108
flag_values = {":cxx_standard": "23"},

Diff for: cc/defs.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ def _common_cxx_opts(exceptions = False, rtti = False, standard = None):
7777
def _construct_local_includes(local_includes):
7878
return [construct_local_include(path) for path in local_includes]
7979

80-
def _link_static(linkstatic = False):
80+
def _link_static(linkstatic = True):
8181
return select({
82-
Label("//cc:_enable_shared"): True,
82+
Label("//cc:_enable_shared"): False,
8383
"//conditions:default": linkstatic,
8484
})
8585

0 commit comments

Comments
 (0)