Allow building the Bazel server for OpenBSD.

src/main/java/com/google/devtools/build/lib/analysis/ShellConfiguration.java

@@ -36,6 +36,7 @@ public class ShellConfiguration extends BuildConfiguration.Fragment {
       ImmutableMap.<OS, PathFragment>builder()
           .put(OS.WINDOWS, PathFragment.create("c:/tools/msys64/usr/bin/bash.exe"))
           .put(OS.FREEBSD, PathFragment.create("/usr/local/bin/bash"))
+          .put(OS.OPENBSD, PathFragment.create("/usr/local/bin/bash"))
           .build();
 
   private final PathFragment shellExecutable;

src/main/java/com/google/devtools/build/lib/analysis/config/AutoCpuConverter.java

@@ -37,6 +37,8 @@ public String convert(String input) throws OptionsParsingException {
           return "darwin";
         case FREEBSD:
           return "freebsd";
+        case OPENBSD:
+          return "openbsd";
         case WINDOWS:
           switch (CPU.getCurrent()) {
             case X86_64:
@@ -81,6 +83,8 @@ public static Pair<CPU, OS> reverse(String input) {
       return Pair.of(CPU.getCurrent(), OS.DARWIN);
     } else if (input.startsWith("freebsd")) {
       return Pair.of(CPU.getCurrent(), OS.FREEBSD);
+    } else if (input.startsWith("openbsd")) {
+      return Pair.of(CPU.getCurrent(), OS.OPENBSD);
     } else if (input.startsWith("x64_windows")) {
       return Pair.of(CPU.getCurrent(), OS.WINDOWS);
     }

src/main/java/com/google/devtools/build/lib/bazel/repository/LocalConfigPlatformFunction.java

@@ -129,6 +129,8 @@ static String osToConstraint(OS os) {
         return "@platforms//os:osx";
       case FREEBSD:
         return "@platforms//os:freebsd";
+      case OPENBSD:
+        return "@platforms//os:openbsd";
       case LINUX:
         return "@platforms//os:linux";
       case WINDOWS:

src/main/java/com/google/devtools/build/lib/platform/JniLoader.java

@@ -28,6 +28,7 @@ class JniLoader {
       switch (OS.getCurrent()) {
         case LINUX:
         case FREEBSD:
+        case OPENBSD:
         case UNKNOWN:
         case DARWIN:
           UnixJniLoader.loadJni();

src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java

@@ -1573,7 +1573,7 @@ public static ImmutableList<CToolchain.Feature> getFeaturesToAppearLastInFeature
   }
 
   private static String ifLinux(CppPlatform platform, String... lines) {
-    // Platform `LINUX` also includes FreeBSD.
+    // Platform `LINUX` also includes FreeBSD and OpenBSD.
     return ifTrue(platform == CppPlatform.LINUX, lines);
   }
 

src/main/java/com/google/devtools/build/lib/runtime/BlazeOptionHandler.java

@@ -326,6 +326,8 @@ private static String getPlatformName() {
         return "windows";
       case FREEBSD:
         return "freebsd";
+      case OPENBSD:
+        return "openbsd";
       default:
         return OS.getCurrent().getCanonicalName();
     }

src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java

@@ -65,8 +65,8 @@ public class CommonCommandOptions extends OptionsBase {
       help =
           "If true, Bazel picks up host-OS-specific config lines from bazelrc files. For example, "
               + "if the host OS is Linux and you run bazel build, Bazel picks up lines starting "
-              + "with build:linux. Supported OS identifiers are linux, macos, windows, and "
-              + "freebsd. Enabling this flag is equivalent to using --config=linux on Linux, "
+              + "with build:linux. Supported OS identifiers are linux, macos, windows, freebsd, "
+              + "and openbsd. Enabling this flag is equivalent to using --config=linux on Linux, "
               + "--config=windows on Windows, etc.")
   public boolean enablePlatformSpecificConfig;
 

src/main/java/com/google/devtools/build/lib/util/OS.java

@@ -21,11 +21,12 @@
 public enum OS {
   DARWIN("osx", "Mac OS X"),
   FREEBSD("freebsd", "FreeBSD"),
+  OPENBSD("openbsd", "OpenBSD"),
   LINUX("linux", "Linux"),
   WINDOWS("windows", "Windows"),
   UNKNOWN("unknown", "");
 
-  private static final EnumSet<OS> POSIX_COMPATIBLE = EnumSet.of(DARWIN, FREEBSD, LINUX);
+  private static final EnumSet<OS> POSIX_COMPATIBLE = EnumSet.of(DARWIN, FREEBSD, OPENBSD, LINUX);
 
   private final String canonicalName;
   private final String detectionName;

src/main/java/com/google/devtools/build/lib/vfs/OsPathPolicy.java

@@ -87,6 +87,7 @@ static OsPathPolicy getFilePathOs() {
     switch (OS.getCurrent()) {
       case LINUX:
       case FREEBSD:
+      case OPENBSD:
       case UNKNOWN:
         return UnixOsPathPolicy.INSTANCE;
       case DARWIN:

src/test/java/com/google/devtools/build/lib/analysis/ShellConfigurationTest.java

@@ -34,6 +34,8 @@ public void getShellExecutableUnset() {
         .isEqualTo(PathFragment.create("/bin/bash"));
     assertThat(determineShellExecutable(OS.FREEBSD, null))
         .isEqualTo(PathFragment.create("/usr/local/bin/bash"));
+    assertThat(determineShellExecutable(OS.OPENBSD, null))
+        .isEqualTo(PathFragment.create("/usr/local/bin/bash"));
     assertThat(determineShellExecutable(OS.WINDOWS, null))
         .isEqualTo(PathFragment.create("c:/tools/msys64/usr/bin/bash.exe"));
   }
@@ -45,6 +47,8 @@ public void getShellExecutableIfSet() {
         .isEqualTo(PathFragment.create("/bin/bash"));
     assertThat(determineShellExecutable(OS.FREEBSD, binBash))
         .isEqualTo(PathFragment.create("/bin/bash"));
+    assertThat(determineShellExecutable(OS.OPENBSD, binBash))
+        .isEqualTo(PathFragment.create("/bin/bash"));
     assertThat(determineShellExecutable(OS.WINDOWS, binBash))
         .isEqualTo(PathFragment.create("/bin/bash"));
   }

src/test/java/com/google/devtools/build/lib/bazel/repository/LocalConfigPlatformFunctionTest.java

@@ -84,6 +84,7 @@ public static Collection createInputValues() {
           new Object[] {OS.LINUX, "@platforms//os:linux"},
           new Object[] {OS.DARWIN, "@platforms//os:osx"},
           new Object[] {OS.FREEBSD, "@platforms//os:freebsd"},
+          new Object[] {OS.OPENBSD, "@platforms//os:openbsd"},
           new Object[] {OS.WINDOWS, "@platforms//os:windows"});
     }
 

src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java

@@ -84,6 +84,10 @@ public static void setup(MockToolsConfig mockToolsConfig) throws IOException {
         "constraint_value(",
         "    name = 'freebsd',",
         "    constraint_setting = ':os',",
+        ")",
+        "constraint_value(",
+        "    name = 'openbsd',",
+        "    constraint_setting = ':os',",
         ")");
     String basePlatform;
     if (TestConstants.LOCAL_CONFIG_PLATFORM_PATH != null) {

src/test/java/com/google/devtools/build/lib/runtime/BlazeOptionHandlerTest.java

@@ -163,6 +163,7 @@ private static ListMultimap<String, RcChunkOfArgs> structuredArgsForDifferentPla
     structuredArgs.put("c0:windows", new RcChunkOfArgs("rc1", ImmutableList.of("command_windows")));
     structuredArgs.put("c0:macos", new RcChunkOfArgs("rc1", ImmutableList.of("command_macos")));
     structuredArgs.put("c0:freebsd", new RcChunkOfArgs("rc1", ImmutableList.of("command_freebsd")));
+    structuredArgs.put("c0:openbsd", new RcChunkOfArgs("rc1", ImmutableList.of("command_openbsd")));
     structuredArgs.put(
         "c0:platform_config",
         new RcChunkOfArgs("rc1", ImmutableList.of("--enable_platform_specific_config")));
@@ -328,6 +329,9 @@ public void testExpandConfigOptions_withPlatformSpecificConfigEnabled() throws E
       case FREEBSD:
         assertThat(parser.getResidue()).containsExactly("command_freebsd");
         break;
+      case OPENBSD:
+        assertThat(parser.getResidue()).containsExactly("command_openbsd");
+        break;
       default:
         assertThat(parser.getResidue()).isEmpty();
     }
@@ -353,6 +357,9 @@ public void testExpandConfigOptions_withPlatformSpecificConfigEnabledInConfig()
       case FREEBSD:
         assertThat(parser.getResidue()).containsExactly("command_freebsd");
         break;
+      case OPENBSD:
+        assertThat(parser.getResidue()).containsExactly("command_openbsd");
+        break;
       default:
         assertThat(parser.getResidue()).isEmpty();
     }

tools/jdk/BUILD

@@ -116,6 +116,11 @@ java_runtime_files(
     srcs = ["include/freebsd/jni_md.h"],
 )
 
+java_runtime_files(
+    name = "jni_md_header-openbsd",
+    srcs = ["include/openbsd/jni_md.h"],
+)
+
 alias(
     name = "java",
     actual = "@local_jdk//:java",