Skip to content

Commit a619e1a

Browse files
authored
Revert "Add CI run with -c opt (#1144)" (#1152)
1 parent 3db49e8 commit a619e1a

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
lines changed

.bazelci/presubmit.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,6 @@ tasks:
133133
test_targets: *default_linux_targets
134134
soft_fail: yes
135135
bazel: "rolling"
136-
ubuntu2004_opt:
137-
name: With -c opt
138-
platform: ubuntu2004
139-
build_flags:
140-
- "--config=rustfmt"
141-
- "--config=clippy"
142-
- "--compilation_mode=opt"
143-
build_targets: *default_linux_targets
144-
test_targets: *default_linux_targets
145136
ubuntu1804:
146137
name: "Min Bazel Version"
147138
bazel: "4.0.0"

rust/private/rustc.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def _are_linkstamps_supported(feature_configuration, has_grep_includes):
119119
has_grep_includes)
120120

121121
def _should_use_pic(cc_toolchain, feature_configuration, crate_type):
122-
if crate_type in ["cdylib", "dylib", "proc-macro"]:
122+
if crate_type in ("cdylib" or "dylib"):
123123
return cc_toolchain.needs_pic_for_dynamic_libraries(feature_configuration = feature_configuration)
124124
return False
125125

@@ -1321,7 +1321,7 @@ def _add_native_link_flags(args, dep_info, linkstamp_outs, ambiguous_libs, crate
13211321
for linkstamp_out in linkstamp_outs:
13221322
args.add_all(["-C", "link-arg=%s" % linkstamp_out.path])
13231323

1324-
if crate_type in ["dylib", "cdylib", "proc-macro"]:
1324+
if crate_type in ["dylib", "cdylib"]:
13251325
# For shared libraries we want to link C++ runtime library dynamically
13261326
# (for example libstdc++.so or libc++.so).
13271327
args.add_all(

test/unit/native_deps/bar.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
int native_global = 42;
21

3-
extern "C" int native_dep() { return native_global; }

test/unit/native_deps/native_action_inputs_test.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ def _native_dep_lib_name(ctx):
5151
ctx.attr._windows_constraint[platform_common.ConstraintValueInfo],
5252
):
5353
return "bar.lib"
54-
elif ("dylib" in ctx.label.name or "proc_macro" in ctx.label.name) and ctx.var["COMPILATION_MODE"] == "opt":
55-
return "libbar.pic.a"
5654
else:
5755
return "libbar.a"
5856

0 commit comments

Comments
 (0)