Compare commits

...

1 Commits

Author SHA1 Message Date
Alexandre Boulgakov
e1b835b242 Swift: Build incompatible OS diagnostic on all platforms. 2023-06-12 16:50:18 +01:00
4 changed files with 16 additions and 8 deletions

View File

@@ -77,12 +77,12 @@ pkg_filegroup(
":extractor", ":extractor",
":swift-test-sdk-arch", ":swift-test-sdk-arch",
] + select({ ] + select({
"@platforms//os:linux": [
":incompatible-os",
],
"@platforms//os:macos": [ "@platforms//os:macos": [
":xcode-autobuilder", ":xcode-autobuilder",
], ],
"//conditions:default": [
":incompatible-os",
],
}), }),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )

View File

@@ -3,7 +3,11 @@
#include <filesystem> #include <filesystem>
#include <stdlib.h> #include <stdlib.h>
#include <optional> #include <optional>
#ifdef _WIN32
#include <process.h>
#else
#include <unistd.h> #include <unistd.h>
#endif
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#define LEVEL_REGEX_PATTERN "trace|debug|info|warning|error|critical|no_logs" #define LEVEL_REGEX_PATTERN "trace|debug|info|warning|error|critical|no_logs"

View File

@@ -10,11 +10,13 @@ def _wrap_cc(rule, kwargs):
# temporary, before we do universal merging # temporary, before we do universal merging
"-universal_binaries", "-universal_binaries",
]) ])
_add_args(kwargs, "target_compatible_with", select({ if "target_compatible_with" not in kwargs:
"@platforms//os:linux": [], # Restrict to Linux or macOS by default, but allow overriding
"@platforms//os:macos": [], _add_args(kwargs, "target_compatible_with", select({
"//conditions:default": ["@platforms//:incompatible"], "@platforms//os:linux": [],
})) "@platforms//os:macos": [],
"//conditions:default": ["@platforms//:incompatible"],
}))
rule(**kwargs) rule(**kwargs)
def swift_cc_binary(**kwargs): def swift_cc_binary(**kwargs):

View File

@@ -7,4 +7,6 @@ swift_cc_binary(
deps = [ deps = [
"//swift/logging", "//swift/logging",
], ],
# No restrictions (Windows allowed)
target_compatible_with = [],
) )