From 7aa64b9fb99c656b46ea2a799232bdabe96d5940 Mon Sep 17 00:00:00 2001 From: Yang Guo Date: Thu, 5 Apr 2018 15:17:56 +0200 Subject: [PATCH] tools: implement ninja build with --build-v8-with-gn PR-URL: https://github.com/nodejs/node/pull/19201 Reviewed-By: Ali Ijaz Sheikh Reviewed-By: Myles Borins Reviewed-By: Matteo Collina Reviewed-By: Colin Ihrig --- common.gypi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 7d6ec8da262ffa..6d83d8a2a1395d 100644 --- a/common.gypi +++ b/common.gypi @@ -49,7 +49,13 @@ 'conditions': [ ['GENERATOR=="ninja"', { 'obj_dir': '<(PRODUCT_DIR)/obj', - 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/libv8_base.a', + 'conditions': [ + [ 'build_v8_with_gn=="true"', { + 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/v8_monolith.gen/gn/obj/libv8_monolith.a', + }, { + 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/libv8_base.a', + }], + ] }, { 'obj_dir%': '<(PRODUCT_DIR)/obj.target', 'v8_base': '<(PRODUCT_DIR)/obj.target/deps/v8/gypfiles/libv8_base.a',