Build script updates

fizzed · Oct 23, 2023 · f20d7f5 · f20d7f5
1 parent 29643b1
commit f20d7f5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/setup/blaze.java b/setup/blaze.java
@@ -71,13 +71,13 @@ public class blaze {
         // OpenBSD
         //
 
-        new Target("openbsd", "x64")
+        /*new Target("openbsd", "x64")
             .setTags("build", "test")
             .setHost("bmh-build-x64-openbsd67-1"),
 
         new Target("openbsd", "arm64")
             .setTags("build", "test")
-            .setHost("bmh-build-arm64-openbsd72-1"),
+            .setHost("bmh-build-arm64-openbsd72-1"),*/
 
         //
         // MacOS

diff --git a/setup/build-container-action.sh b/setup/build-container-action.sh
@@ -21,7 +21,7 @@ if [ ! -z "$(echo $BUILDARCH | grep "\-test")" ]; then
   fi
 fi
 
-docker build -f "$DOCKERFILE" --progress=plain \
+docker build -f "$DOCKERFILE" \
   --build-arg "FROM_IMAGE=${DOCKER_IMAGE}" \
   --build-arg USERID=${USERID} \
   --build-arg USERNAME=${USERNAME} \

diff --git a/src/main/java/com/fizzed/jne/Options.java b/src/main/java/com/fizzed/jne/Options.java
@@ -45,7 +45,12 @@ public Options() {
         // defaults
         this.operatingSystem = PlatformInfo.detectOperatingSystem();
         this.hardwareArchitecture = PlatformInfo.detectHardwareArchitecture();
-        this.linuxLibC = PlatformInfo.detectLinuxLibC();
+        // we only need to detect libc for linux
+        if (this.operatingSystem == OperatingSystem.LINUX) {
+            this.linuxLibC = PlatformInfo.detectLinuxLibC();
+        } else {
+            this.linuxLibC = null;
+        }
         this.resourcePrefix = System.getProperty(SYSPROP_RESOURCE_PREFIX, "/jne");
         this.extractDir = getSystemPropertyAsFile(SYSPROP_EXTRACT_DIR, null);
         this.x32ExecutableFallback = getSystemPropertyAsBoolean(SYSPROP_X32_EXE_FALLBACK, true);