From 009fe698ee6be1f10f78641a72b3ecaa8cd498c0 Mon Sep 17 00:00:00 2001 From: baixo Date: Mon, 24 Nov 2014 04:43:28 -0800 Subject: [PATCH] The file snapshot_blob_host.bin was supposed to be generated when building the host toolset. However, the file snapshot_blob.bin was being generated instead, under every set of conditions. Because of this, every time we build the host toolset, snapshot_blob_host.bin is not found. This causes the target (v8_external_snapshot) that generates such file to be run. This target generates snapshot_blob.bin instead of snapshot_blob_host.bin. This in turn causes all the targets that depend on snapshot_blob.bin to run again. After this, we still don't have snapshot_blob_host.bin. So the next time we build, the whole process described above happens again. BUG=421063 Review URL: https://codereview.chromium.org/741223002 Cr-Commit-Position: refs/heads/master@{#25480} --- tools/gyp/v8.gyp | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index 5658608..38d1cef 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -274,6 +274,17 @@ 'inputs': [ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ], + 'variables': { + 'mksnapshot_flags': [ + '--log-snapshot-positions', + '--logfile', '<(INTERMEDIATE_DIR)/snapshot.log', + ], + 'conditions': [ + ['v8_random_seed!=0', { + 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'], + }], + ], + }, 'conditions': [ ['want_separate_host_toolset==1', { 'target_conditions': [ @@ -282,11 +293,23 @@ '<(INTERMEDIATE_DIR)/snapshot.cc', '<(PRODUCT_DIR)/snapshot_blob_host.bin', ], + 'action': [ + '<@(_inputs)', + '<@(mksnapshot_flags)', + '<@(INTERMEDIATE_DIR)/snapshot.cc', + '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob_host.bin', + ], }, { 'outputs': [ '<(INTERMEDIATE_DIR)/snapshot.cc', '<(PRODUCT_DIR)/snapshot_blob.bin', ], + 'action': [ + '<@(_inputs)', + '<@(mksnapshot_flags)', + '<@(INTERMEDIATE_DIR)/snapshot.cc', + '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob.bin', + ], }], ], }, { @@ -294,25 +317,14 @@ '<(INTERMEDIATE_DIR)/snapshot.cc', '<(PRODUCT_DIR)/snapshot_blob.bin', ], + 'action': [ + '<@(_inputs)', + '<@(mksnapshot_flags)', + '<@(INTERMEDIATE_DIR)/snapshot.cc', + '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob.bin', + ], }], ], - 'variables': { - 'mksnapshot_flags': [ - '--log-snapshot-positions', - '--logfile', '<(INTERMEDIATE_DIR)/snapshot.log', - ], - 'conditions': [ - ['v8_random_seed!=0', { - 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'], - }], - ], - }, - 'action': [ - '<@(_inputs)', - '<@(mksnapshot_flags)', - '<@(INTERMEDIATE_DIR)/snapshot.cc', - '--startup_blob', '<(PRODUCT_DIR)/snapshot_blob.bin', - ], }, ], }], -- 2.7.4