1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 23:34:47 -05:00

build: fold config("win_crt_agnostic") into config("deno_config")

This commit is contained in:
Bert Belder 2018-12-20 02:07:06 +01:00
parent 0ff5aa0a33
commit c531b0c27f
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461

View file

@ -5,30 +5,28 @@ import("//third_party/v8/gni/v8.gni")
config("deno_config") { config("deno_config") {
include_dirs = [ "//third_party/v8" ] # This allows us to v8/src/base/ libraries. include_dirs = [ "//third_party/v8" ] # This allows us to v8/src/base/ libraries.
configs = [ "//third_party/v8:external_config" ] configs = [ "//third_party/v8:external_config" ]
cflags = []
if (is_debug) { if (is_debug) {
defines = [ "DEBUG" ] defines = [ "DEBUG" ]
} }
if (is_clang) { if (is_clang) {
cflags = [ cflags += [
"-fcolor-diagnostics", "-fcolor-diagnostics",
"-fansi-escape-codes", "-fansi-escape-codes",
] ]
} }
}
# The `/Zl` ("omit default library name") flag makes the compiler produce object
# files that can link with both static and dynamic libc.
config("win_crt_agnostic") {
if (is_win) { if (is_win) {
cflags = [ "/Zl" ] # The `/Zl` ("omit default library name") flag makes the compiler produce
# object files that can link with both the static and dynamic CRT.
cflags += [ "/Zl" ]
} }
} }
v8_source_set("v8") { v8_source_set("v8") {
configs = [ configs = [ ":deno_config" ]
":deno_config",
":win_crt_agnostic",
]
deps = [ deps = [
"//third_party/v8:v8", "//third_party/v8:v8",
"//third_party/v8:v8_libbase", "//third_party/v8:v8_libbase",
@ -43,10 +41,7 @@ v8_source_set("v8") {
# dependencies are minimal. # dependencies are minimal.
# The cargo-driven build links with libdeno to pull in all non-rust code. # The cargo-driven build links with libdeno to pull in all non-rust code.
v8_static_library("libdeno") { v8_static_library("libdeno") {
configs = [ configs = [ ":deno_config" ]
":deno_config",
":win_crt_agnostic",
]
sources = [ sources = [
"api.cc", "api.cc",
"binding.cc", "binding.cc",