Skip to content

Commit a68f2e7

Browse files
committed
remove windows bazle build
1 parent da56b73 commit a68f2e7

File tree

3 files changed

+11
-55
lines changed

3 files changed

+11
-55
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
common --enable_platform_specific_config
22

3-
build --cxxopt=-std=c++20
3+
build --cxxopt=-std=c++2a
44

55
# Show everything when running tests.
66
test --test_output=streamed

.github/workflows/main.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -473,20 +473,6 @@ jobs:
473473
working-directory: ${{ github.workspace }}/build
474474
run: ctest -j 2 --interactive-debug-mode 0 --output-on-failure -C ${{ matrix.build-type }} --timeout 400
475475
timeout-minutes: 20
476-
- uses: bazelbuild/setup-bazelisk@v3
477-
- name: Mount bazel cache # Optional
478-
uses: actions/cache@v4
479-
with:
480-
path: "~/.cache/bazel"
481-
key: bazel
482-
- name: Bazel build
483-
run: bazel build -c opt //:snmalloc
484-
shell: bash
485-
- name: Bazel build with rust
486-
run: bazel build -c opt //:snmalloc-rs
487-
shell: bash
488-
489-
490476

491477
# Job to run clang-format and report errors
492478
format:
@@ -527,13 +513,6 @@ jobs:
527513
run: cmake --build ${{github.workspace}}/build --target snmalloc-fuzzer
528514
- name: Test
529515
run: ${{github.workspace}}/build/fuzzing/snmalloc-fuzzer
530-
- uses: bazelbuild/setup-bazelisk@v3
531-
- name: Mount bazel cache # Optional
532-
uses: actions/cache@v4
533-
with:
534-
path: "~/.cache/bazel"
535-
key: bazel
536-
- run: bazel test -c opt --config=asan //fuzzing:snmalloc_fuzzer
537516

538517
self-vendored:
539518
strategy:

BUILD.bazel

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,22 @@ cmake(
2727
lib_source = ":srcs",
2828
out_headers_only = False,
2929
out_shared_libs = select({
30-
"@bazel_tools//src/conditions:windows": [
31-
"libsnmallocshim-checks-memcpy-only.dll",
32-
"libsnmallocshim-checks.dll",
33-
"libsnmallocshim.dll",
34-
],
35-
"@bazel_tools//src/conditions:macos": [
30+
"@bazel_tools//src/conditions:darwin": [
3631
"libsnmallocshim-checks-memcpy-only.dylib",
3732
"libsnmallocshim-checks.dylib",
3833
"libsnmallocshim.dylib",
3934
],
4035
"//conditions:default": [],
4136
}),
42-
out_static_libs = select({
43-
"@bazel_tools//src/conditions:windows": [
44-
"libsnmallocshim-static.lib",
45-
"libsnmalloc-new-override.lib",
46-
],
47-
"//conditions:default": [
48-
"libsnmallocshim-static.a",
49-
"libsnmalloc-new-override.a",
50-
],
51-
}),
37+
out_static_libs = [
38+
"libsnmallocshim-static.a",
39+
"libsnmalloc-new-override.a",
40+
],
5241
postfix_script = "ninja",
5342
visibility = ["//visibility:public"],
5443
)
5544

5645
cmake(
57-
exe,
5846
name = "snmalloc-rs",
5947
build_args = [
6048
"-j12",
@@ -70,28 +58,17 @@ cmake(
7058
lib_source = ":srcs",
7159
out_headers_only = False,
7260
out_shared_libs = select({
73-
"@bazel_tools//src/conditions:windows": [
74-
"libsnmallocshim-checks-memcpy-only.dll",
75-
"libsnmallocshim-checks.dll",
76-
"libsnmallocshim.dll",
77-
],
78-
"@bazel_tools//src/conditions:macos": [
61+
"@bazel_tools//src/conditions:darwin": [
7962
"libsnmallocshim-checks-memcpy-only.dylib",
8063
"libsnmallocshim-checks.dylib",
8164
"libsnmallocshim.dylib",
8265
],
8366
"//conditions:default": [],
8467
}),
85-
out_static_libs = select({
86-
"@bazel_tools//src/conditions:windows": [
87-
"libsnmallocshim-static.lib",
88-
"libsnmalloc-new-override.lib",
89-
],
90-
"//conditions:default": [
91-
"libsnmallocshim-static.a",
92-
"libsnmalloc-new-override.a",
93-
],
94-
}),
68+
out_static_libs = [
69+
"libsnmallocshim-static.a",
70+
"libsnmalloc-new-override.a",
71+
],
9572
postfix_script = "ninja",
9673
visibility = ["//visibility:public"],
9774
)

0 commit comments

Comments
 (0)