summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2018-12-20 02:11:58 +0100
committerBert Belder <bertbelder@gmail.com>2018-12-20 02:23:48 +0100
commit9e70b0d10985ccf695b58872dafc7b0c33657372 (patch)
tree1e98b17875889a36d586b8c379e0f4249897552d
parentc531b0c27fad0a33fb86af2c457e0e6ed649388a (diff)
build: fix mac linking problem
-rw-r--r--BUILD.gn2
-rw-r--r--libdeno/BUILD.gn16
2 files changed, 13 insertions, 5 deletions
diff --git a/BUILD.gn b/BUILD.gn
index bf87fc61a..69c1b741f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -111,7 +111,7 @@ group("deno_deps") {
deps = [
":msg_rs",
":snapshot_deno",
- "libdeno:libdeno",
+ "libdeno:libdeno_static_lib",
]
}
diff --git a/libdeno/BUILD.gn b/libdeno/BUILD.gn
index 1164e9a7b..f2a9228c5 100644
--- a/libdeno/BUILD.gn
+++ b/libdeno/BUILD.gn
@@ -26,22 +26,20 @@ config("deno_config") {
}
v8_source_set("v8") {
- configs = [ ":deno_config" ]
deps = [
"//third_party/v8:v8",
"//third_party/v8:v8_libbase",
"//third_party/v8:v8_libplatform",
"//third_party/v8:v8_libsampler",
]
+ configs = [ ":deno_config" ]
}
# Only functionality needed for libdeno_test and snapshot_creator
# In particular no flatbuffers, no assets, no rust, no msg handlers.
# Because snapshots are slow, it's important that snapshot_creator's
# dependencies are minimal.
-# The cargo-driven build links with libdeno to pull in all non-rust code.
-v8_static_library("libdeno") {
- configs = [ ":deno_config" ]
+v8_source_set("libdeno") {
sources = [
"api.cc",
"binding.cc",
@@ -52,8 +50,18 @@ v8_static_library("libdeno") {
]
deps = [
":v8",
+ ]
+ configs = [ ":deno_config" ]
+}
+
+# The cargo-driven build links with libdeno to pull in all non-rust code.
+v8_static_library("libdeno_static_lib") {
+ output_name = "libdeno"
+ deps = [
+ ":libdeno",
"//build/config:shared_library_deps",
]
+ configs = [ ":deno_config" ]
}
v8_executable("snapshot_creator") {