aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2024-05-09 12:39:24 -0700
committerErwin Jansen <jansene@google.com>2024-05-10 10:04:19 -0700
commit58cd2488e62c98a15c3168c276dbe457cff29741 (patch)
tree4b105ceca9b3d68d040e2237707038be84872b52
parent5b227afa3208c08cd42f3ee920e0e93936c56168 (diff)
downloadcrosvm-emu-dev.tar.gz
Linux build fixesemu-dev
This contains a series of build fixes to make sure we can compile rutabaga linux. Change-Id: I7830e99422646858cedeeadf299b0acfc9eddd36
-rw-r--r--rutabaga_gfx/BUILD1
-rw-r--r--rutabaga_gfx/ffi/BUILD15
2 files changed, 10 insertions, 6 deletions
diff --git a/rutabaga_gfx/BUILD b/rutabaga_gfx/BUILD
index 7eefde57a..f05467bdc 100644
--- a/rutabaga_gfx/BUILD
+++ b/rutabaga_gfx/BUILD
@@ -48,6 +48,7 @@ rust_library(
"@winapi",
"@winapi-x86_64-pc-windows-gnu",
],
+ "@platforms//os:linux": ["@nix"],
"//conditions:default": [],
}),
)
diff --git a/rutabaga_gfx/ffi/BUILD b/rutabaga_gfx/ffi/BUILD
index 700e22e44..3907e52cd 100644
--- a/rutabaga_gfx/ffi/BUILD
+++ b/rutabaga_gfx/ffi/BUILD
@@ -23,18 +23,25 @@ license_kind(
url = "https://spdx.org/licenses/Apache-2.0.html",
)
+CRATE_FEATURES = [
+ "rutabaga_gfx/gfxstream",
+]
+
rust_static_library(
name = "ffi",
srcs = glob(["src/**/*.rs"]),
+ crate_features = CRATE_FEATURES,
edition = "2021",
deps = [
- ":ffi_build_script",
"//external/crosvm/rutabaga_gfx",
"//hardware/google/gfxstream/host:gfxstream_backend",
"@libc",
"@log",
"@once_cell",
- ],
+ ] + select({
+ "@platforms//os:linux": ["@nix"],
+ "//conditions:default": [],
+ }),
)
cc_library(
@@ -48,10 +55,6 @@ cc_library(
deps = [":ffi"],
)
-CRATE_FEATURES = [
- "rutabaga_gfx/gfxstream",
-]
-
cargo_build_script(
name = "ffi_build_script",
srcs = glob(["**/*.rs"]),