From 9e70b0d10985ccf695b58872dafc7b0c33657372 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 20 Dec 2018 02:11:58 +0100 Subject: [PATCH] build: fix mac linking problem --- BUILD.gn | 2 +- libdeno/BUILD.gn | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index bf87fc61a4..69c1b741fc 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 1164e9a7b5..f2a9228c54 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") {