Commit 96e8e86
deps: cherry-pick 6f68f30 from v8 upstream
Original commit message:
[build] Add force_dynamic_crt option to build a static library with /…
…MD on windows
Adds option to build a V8 library statically, but with the options on
windows that allows it to be subsequently included in another DLL. On
Windows this is required for it to correclty link against the correct
C++ runtime. Require for our Node.js shared library build.
Reference: #7487
BUG=
R=machenbach@chromium.org, michael_dawson@ca.ibm.com
Committed: https://crrev.com/9cf88c1c364cf76c1e745aa63196768435e8ef5d
Review-Url: https://codereview.chromium.org/2149963002
Cr-Original-Commit-Position: refs/heads/master@{#37814}
Cr-Commit-Position: refs/heads/master@{#37856}
Ref: #7802
Ref: #8084
PR-URL: #9610
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>1 parent 804b398 commit 96e8e86
3 files changed
Lines changed: 5 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,6 +33,7 @@ | |||
| 33 | 33 | 'includes': ['toolchain.gypi'], | |
| 34 | 34 | 'variables': { | |
| 35 | 35 | 'component%': 'static_library', | |
| 36 | + 'force_dynamic_crt%': 0, | ||
| 36 | 37 | 'clang_xcode%': 0, | |
| 37 | 38 | # Track where uninitialized memory originates from. From fastest to | |
| 38 | 39 | # slowest: 0 - no tracking, 1 - track only the initial allocation site, 2 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1104,7 +1104,7 @@ | |||
| 1104 | 1104 | 'VCCLCompilerTool': { | |
| 1105 | 1105 | 'Optimization': '0', | |
| 1106 | 1106 | 'conditions': [ | |
| 1107 | - ['component=="shared_library"', { | ||
| 1107 | + ['component=="shared_library" or force_dynamic_crt==1', { | ||
| 1108 | 1108 | 'RuntimeLibrary': '3', # /MDd | |
| 1109 | 1109 | }, { | |
| 1110 | 1110 | 'RuntimeLibrary': '1', # /MTd | |
@@ -1156,7 +1156,7 @@ | |||
| 1156 | 1156 | 'StringPooling': 'true', | |
| 1157 | 1157 | 'BasicRuntimeChecks': '0', | |
| 1158 | 1158 | 'conditions': [ | |
| 1159 | - ['component=="shared_library"', { | ||
| 1159 | + ['component=="shared_library" or force_dynamic_crt==1', { | ||
| 1160 | 1160 | 'RuntimeLibrary': '3', #/MDd | |
| 1161 | 1161 | }, { | |
| 1162 | 1162 | 'RuntimeLibrary': '1', #/MTd | |
@@ -1347,7 +1347,7 @@ | |||
| 1347 | 1347 | 'FavorSizeOrSpeed': '0', | |
| 1348 | 1348 | 'StringPooling': 'true', | |
| 1349 | 1349 | 'conditions': [ | |
| 1350 | - ['component=="shared_library"', { | ||
| 1350 | + ['component=="shared_library" or force_dynamic_crt==1', { | ||
| 1351 | 1351 | 'RuntimeLibrary': '2', #/MD | |
| 1352 | 1352 | }, { | |
| 1353 | 1353 | 'RuntimeLibrary': '0', #/MT | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ | |||
| 11 | 11 | #define V8_MAJOR_VERSION 5 | |
| 12 | 12 | #define V8_MINOR_VERSION 1 | |
| 13 | 13 | #define V8_BUILD_NUMBER 281 | |
| 14 | - #define V8_PATCH_LEVEL 87 | ||
| 14 | + #define V8_PATCH_LEVEL 88 | ||
| 15 | 15 | ||
| 16 | 16 | // Use 1 for candidates and 0 otherwise. | |
| 17 | 17 | // (Boolean macro values are not supported by all preprocessors.) | |
0 commit comments