File tree Expand file tree Collapse file tree 4 files changed +1
-27
lines changed Expand file tree Collapse file tree 4 files changed +1
-27
lines changed Original file line number Diff line number Diff line change @@ -75,21 +75,13 @@ pkg_filegroup(
75
75
visibility = ["//visibility:public" ],
76
76
)
77
77
78
- pkg_files (
79
- name = "swift-test-sdk-arch" ,
80
- srcs = ["//swift/third_party/swift-llvm-support:swift-test-sdk" ],
81
- prefix = "qltest/" + codeql_platform ,
82
- strip_prefix = strip_prefix .from_pkg (),
83
- )
84
-
85
78
pkg_filegroup (
86
79
name = "extractor-pack-arch" ,
87
80
srcs = select ({
88
81
"@platforms//os:windows" : [],
89
82
"//conditions:default" : [
90
83
":extractor" ,
91
84
":resource-dir-arch" ,
92
- ":swift-test-sdk-arch" ,
93
85
],
94
86
}) + select ({
95
87
"@platforms//os:macos" : [
Original file line number Diff line number Diff line change @@ -32,12 +32,3 @@ cc_library(
32
32
}),
33
33
visibility = ["//visibility:public"],
34
34
)
35
-
36
- pkg_files(
37
- name = "swift-test-sdk",
38
- srcs = glob([
39
- "sdk/**/*",
40
- ]),
41
- strip_prefix = strip_prefix.from_pkg(),
42
- visibility = ["//visibility:public"],
43
- )
Original file line number Diff line number Diff line change 8
8
}),
9
9
)
10
10
11
- alias (
12
- name = "swift-test-sdk" ,
13
- actual = select ({
14
- "@bazel_tools//src/conditions:linux" : "@swift_prebuilt_linux//:swift-test-sdk" ,
15
- "@bazel_tools//src/conditions:darwin" : "@swift_prebuilt_darwin_x86_64//:swift-test-sdk" ,
16
- }),
17
- )
18
-
19
11
alias (
20
12
name = "swift-resource-dir" ,
21
13
actual = select ({
Original file line number Diff line number Diff line change @@ -5,12 +5,11 @@ mkdir -p "$CODEQL_EXTRACTOR_SWIFT_TRAP_DIR"
5
5
QLTEST_LOG=" $CODEQL_EXTRACTOR_SWIFT_LOG_DIR " /qltest.log
6
6
7
7
EXTRACTOR=" $CODEQL_EXTRACTOR_SWIFT_ROOT /tools/$CODEQL_PLATFORM /extractor"
8
- SDK=" $CODEQL_EXTRACTOR_SWIFT_ROOT /qltest/$CODEQL_PLATFORM /sdk"
9
8
RESOURCE_DIR=" $CODEQL_EXTRACTOR_SWIFT_ROOT /resource-dir/$CODEQL_PLATFORM "
10
9
export CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS=${CODEQL_EXTRACTOR_SWIFT_LOG_LEVELS:- out: text: no_logs,out: console: info}
11
10
for src in * .swift; do
12
11
env=()
13
- opts=(-sdk " $SDK " - resource-dir " $RESOURCE_DIR " -c -primary-file " $src " )
12
+ opts=(-resource-dir " $RESOURCE_DIR " -c -primary-file " $src " )
14
13
opts+=($( sed -n ' 1 s=//codeql-extractor-options:==p' $src ) )
15
14
expected_status=$( sed -n ' s=//codeql-extractor-expected-status:[[:space:]]*==p' $src )
16
15
expected_status=${expected_status:- 0}
You can’t perform that action at this time.
0 commit comments