Update std.toolchain(), curl, and openssl to set CMake project …

…root vars
brioche-dev · Nov 28, 2024 · b640574 · b640574
1 parent 48a90cf
commit b640574
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/cmake/project.bri b/packages/cmake/project.bri
@@ -72,11 +72,6 @@ export default function (): std.Recipe<std.Directory> {
   `
     .workDir(source)
     .dependencies(std.toolchain(), openssl(), curl())
-    .env({
-      OPENSSL_ROOT_DIR: openssl(),
-      ZLIB_ROOT: std.toolchain(),
-      CURL_ROOT: curl(),
-    })
     .toDirectory();
 
   cmake = cmake.insert("libexec/cmake/runtime-utils", std.runtimeUtils());

diff --git a/packages/curl/project.bri b/packages/curl/project.bri
@@ -31,6 +31,7 @@ export default function (): std.Recipe<std.Directory> {
     CPATH: { append: [{ path: "include" }] },
     LIBRARY_PATH: { append: [{ path: "lib" }] },
     PKG_CONFIG_PATH: { append: [{ path: "lib/pkgconfig" }] },
+    CURL_ROOT: { fallback: { path: "." } },
   });
 
   return std.withRunnableLink(curl, "bin/curl");

diff --git a/packages/openssl/project.bri b/packages/openssl/project.bri
@@ -28,6 +28,7 @@ export default function openssl(): std.Recipe<std.Directory> {
     CPATH: { append: [{ path: "include" }] },
     LIBRARY_PATH: { append: [{ path: "lib" }] },
     PKG_CONFIG_PATH: { append: [{ path: "lib/pkgconfig" }] },
+    OPENSSL_ROOT_DIR: { fallback: { path: "." } },
   });
 
   return std.withRunnableLink(openssl, "bin/openssl");

diff --git a/packages/std/toolchain/native/index.bri b/packages/std/toolchain/native/index.bri
@@ -229,6 +229,9 @@ export const toolchain = std.memo(
       // pkg-config search paths
       PKG_CONFIG_PATH: { append: [{ path: "lib/pkgconfig" }] },
 
+      // CMake package paths
+      ZLIB_ROOT: { fallback: { path: "." } },
+
       // Bison data dir
       BISON_PKGDATADIR: { fallback: { path: "share/bison" } },