From 421b568bfcf2805b3cf4a0a8eb355dc77b913feb Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Thu, 16 Mar 2023 18:25:47 +0100 Subject: [PATCH] fix: move libsolv to crate level for publishing (#120) --- .gitmodules | 2 +- crates/rattler_solve/build.rs | 2 +- libsolv => crates/rattler_solve/libsolv | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename libsolv => crates/rattler_solve/libsolv (100%) diff --git a/.gitmodules b/.gitmodules index 79573eb3b..369178514 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "crates/rattler/libsolv"] - path = libsolv + path = crates/rattler_solve/libsolv url = https://github.com/baszalmstra/libsolv diff --git a/crates/rattler_solve/build.rs b/crates/rattler_solve/build.rs index f1d12d139..3c698928e 100644 --- a/crates/rattler_solve/build.rs +++ b/crates/rattler_solve/build.rs @@ -26,7 +26,7 @@ fn build_libsolv() -> Result { let target = std::env::var("TARGET").unwrap(); let is_windows = target.contains("windows"); - let p = path::PathBuf::from("./../../libsolv/CMakeLists.txt"); + let p = path::PathBuf::from("./libsolv/CMakeLists.txt"); if !p.is_file() { return Err(anyhow!( "Bundled libsolv not found, please do `git submodule update --init`." diff --git a/libsolv b/crates/rattler_solve/libsolv similarity index 100% rename from libsolv rename to crates/rattler_solve/libsolv