Skip to content

Commit 96e8e86

Browse files
stefanmbMyles Borins
authored and
Myles Borins
committed
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= [email protected], [email protected] 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 <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Ali Ijaz Sheikh <[email protected]>
1 parent 804b398 commit 96e8e86

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

deps/v8/build/standalone.gypi

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'includes': ['toolchain.gypi'],
3434
'variables': {
3535
'component%': 'static_library',
36+
'force_dynamic_crt%': 0,
3637
'clang_xcode%': 0,
3738
# Track where uninitialized memory originates from. From fastest to
3839
# slowest: 0 - no tracking, 1 - track only the initial allocation site, 2

deps/v8/build/toolchain.gypi

+3-3
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@
11041104
'VCCLCompilerTool': {
11051105
'Optimization': '0',
11061106
'conditions': [
1107-
['component=="shared_library"', {
1107+
['component=="shared_library" or force_dynamic_crt==1', {
11081108
'RuntimeLibrary': '3', # /MDd
11091109
}, {
11101110
'RuntimeLibrary': '1', # /MTd
@@ -1156,7 +1156,7 @@
11561156
'StringPooling': 'true',
11571157
'BasicRuntimeChecks': '0',
11581158
'conditions': [
1159-
['component=="shared_library"', {
1159+
['component=="shared_library" or force_dynamic_crt==1', {
11601160
'RuntimeLibrary': '3', #/MDd
11611161
}, {
11621162
'RuntimeLibrary': '1', #/MTd
@@ -1347,7 +1347,7 @@
13471347
'FavorSizeOrSpeed': '0',
13481348
'StringPooling': 'true',
13491349
'conditions': [
1350-
['component=="shared_library"', {
1350+
['component=="shared_library" or force_dynamic_crt==1', {
13511351
'RuntimeLibrary': '2', #/MD
13521352
}, {
13531353
'RuntimeLibrary': '0', #/MT

deps/v8/include/v8-version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 5
1212
#define V8_MINOR_VERSION 1
1313
#define V8_BUILD_NUMBER 281
14-
#define V8_PATCH_LEVEL 87
14+
#define V8_PATCH_LEVEL 88
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

0 commit comments

Comments
 (0)