Skip to content

Commit

Permalink
Revert "fix compatibility with linux"
Browse files Browse the repository at this point in the history
This reverts commit e62eaea.
  • Loading branch information
shiinamiyuki committed Aug 27, 2024
1 parent e62eaea commit 3dbe513
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion luisa_compute/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,5 @@ strict = ["luisa_compute_sys/strict"]
remote = ["luisa_compute_sys/remote"]
cpu = ["luisa_compute_sys/cpu"]
oidn = ["luisa_compute_sys/oidn"]
wayland = ["luisa_compute_sys/wayland"]
glam = ["dep:glam"]
nalgebra = ["dep:nalgebra"]
1 change: 0 additions & 1 deletion luisa_compute_sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ remote = []
metal = []
dx = []
oidn = []
wayland = []

4 changes: 1 addition & 3 deletions luisa_compute_sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ fn cmake_build() -> PathBuf {
set_from_env!("PYTHON", "LUISA_COMPUTE_ENABLE_PYTHON");
set_from_env!("GUI", "LUISA_COMPUTE_ENABLE_GUI");
set_from_env!("OIDN", "LUISA_COMPUTE_DOWNLOAD_OIDN");
set_from_env!("WAYLAND", "LUISA_COMPUTE_ENABLE_WAYLAND");
config.define(
"LUISA_COMPUTE_CHECK_BACKEND_DEPENDENCIES",
if cfg!(feature = "strict") {
Expand Down Expand Up @@ -200,11 +199,10 @@ fn main() {
{
println!("rerun-if-changed=./llvm_dummy_orc");
let out = cmake::Config::new("./llvm_dummy_orc")
.generator("Ninja")
.build_target("dummy_orc_eh")
.build();
dbg!(&out);
println!("cargo:rustc-link-lib=static=dummy_orc_eh");
println!("cargo:rustc-link-lib=dylib=dummy_orc_eh");
println!("cargo:rustc-link-search=native={}/build", out.display());
}
}
3 changes: 1 addition & 2 deletions luisa_compute_sys/llvm_dummy_orc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 3.15)
project(dummy_orc_eh)

add_library(dummy_orc_eh STATIC dummy_orc_eh.cc)
set_property(TARGET dummy_orc_eh PROPERTY POSITION_INDEPENDENT_CODE ON)
add_library(dummy_orc_eh SHARED dummy_orc_eh.cc)

0 comments on commit 3dbe513

Please sign in to comment.