Fix detect-libc

4 files changed, 35 insertions, 90 deletions

diff --git a/src/js/out/modules/thirdparty/detect-libc.js b/src/js/out/modules/thirdparty/detect-libc.js
index 1c4e18a7a..47aaefa5e 100644
--- a/src/js/out/modules/thirdparty/detect-libc.js
+++ b/src/js/out/modules/thirdparty/detect-libc.js
@@ -1,28 +1,31 @@
-function family() {
-  return Promise.resolve(familySync());
-}
-function familySync() {
-  return null;
+function version() {
+  return libcVersion;
 }
 function versionAsync() {
-  return Promise.resolve(version());
+  return Promise.resolve(libcVersion);
 }
-function version() {
-  return null;
+function family() {
+  return libcFamily;
 }
-function isNonGlibcLinuxSync() {
-  return !1;
+function familyAsync() {
+  return Promise.resolve(libcFamily);
 }
 function isNonGlibcLinux() {
-  return Promise.resolve(isNonGlibcLinuxSync());
+  return Promise.resolve(libcFamily === "musl");
+}
+function isNonGlibcLinuxSync() {
+  return libcFamily === "musl";
 }
-var GLIBC = "glibc", MUSL = "musl";
+var {
+  version: libcVersion,
+  family: libcFamily
+} = globalThis[Symbol.for("Bun.lazy")]("detect-libc"), GLIBC = "glibc", MUSL = "musl";
 export {
   versionAsync,
   version,
   isNonGlibcLinuxSync,
   isNonGlibcLinux,
-  familySync,
+  familyAsync,
   family,
   MUSL,
   GLIBC
diff --git a/src/js/out/modules/thirdparty/detect-libc.linux.js b/src/js/out/modules/thirdparty/detect-libc.linux.js
deleted file mode 100644
index 1c4e18a7a..000000000
--- a/src/js/out/modules/thirdparty/detect-libc.linux.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function family() {
-  return Promise.resolve(familySync());
-}
-function familySync() {
-  return null;
-}
-function versionAsync() {
-  return Promise.resolve(version());
-}
-function version() {
-  return null;
-}
-function isNonGlibcLinuxSync() {
-  return !1;
-}
-function isNonGlibcLinux() {
-  return Promise.resolve(isNonGlibcLinuxSync());
-}
-var GLIBC = "glibc", MUSL = "musl";
-export {
-  versionAsync,
-  version,
-  isNonGlibcLinuxSync,
-  isNonGlibcLinux,
-  familySync,
-  family,
-  MUSL,
-  GLIBC
-};
diff --git a/src/js/thirdparty/detect-libc.js b/src/js/thirdparty/detect-libc.js
index 514a76536..21110cc66 100644
--- a/src/js/thirdparty/detect-libc.js
+++ b/src/js/thirdparty/detect-libc.js
@@ -1,27 +1,33 @@
-// Hardcoded module "detect-libc" for darwin
-export function family() {
-  return Promise.resolve(familySync());
-}
+// https://www.npmjs.com/package/detect-libc
 
-export function familySync() {
-  return null;
-}
+const {
+  version: libcVersion,
+  family: libcFamily,
+} = globalThis[Symbol.for("Bun.lazy")]("detect-libc");
 
 export const GLIBC = "glibc";
 export const MUSL = "musl";
 
+export function version() {
+  return libcVersion;
+}
+
 export function versionAsync() {
-  return Promise.resolve(version());
+  return Promise.resolve(libcVersion);
 }
 
-export function version() {
-  return null;
+export function family() {
+  return libcFamily;
 }
 
-export function isNonGlibcLinuxSync() {
-  return false;
+export function familyAsync() {
+  return Promise.resolve(libcFamily);
 }
 
 export function isNonGlibcLinux() {
-  return Promise.resolve(isNonGlibcLinuxSync());
+  return Promise.resolve(libcFamily === MUSL);
+}
+
+export function isNonGlibcLinuxSync() {
+  return libcFamily === MUSL;
 }
diff --git a/src/js/thirdparty/detect-libc.linux.js b/src/js/thirdparty/detect-libc.linux.js
deleted file mode 100644
index 4c6557247..000000000
--- a/src/js/thirdparty/detect-libc.linux.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Hardcoded module "detect-libc" for linux
-export function family() {
-  return Promise.resolve(familySync());
-}
-
-export function familySync() {
-  if (process.platform === "linux") {
-    return GLIBC;
-  } else {
-    return null;
-  }
-}
-
-export const GLIBC = "glibc";
-export const MUSL = "musl";
-
-export function versionAsync() {
-  return Promise.resolve(version());
-}
-
-export function version() {
-  if (process.platform === "linux") {
-    return "2.29";
-  } else {
-    return null;
-  }
-}
-
-export function isNonGlibcLinuxSync() {
-  return false;
-}
-
-export function isNonGlibcLinux() {
-  return Promise.resolve(isNonGlibcLinuxSync());
-}