Skip to content

Commit e93720d

Browse files
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= 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}
1 parent f1d804a commit e93720d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

deps/v8/build/toolchain.gypi

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
'ubsan_vptr%': 0,
4040
'v8_target_arch%': '<(target_arch)',
4141
'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
42+
'force_dynamic_crt%': 0,
4243
# Native Client builds currently use the V8 ARM JIT and
4344
# arm/simulator-arm.cc to defer the significant effort required
4445
# for NaCl JIT support. The nacl_target_arch variable provides
@@ -1104,7 +1105,7 @@
11041105
'VCCLCompilerTool': {
11051106
'Optimization': '0',
11061107
'conditions': [
1107-
['component=="shared_library"', {
1108+
['component=="shared_library" or force_dynamic_crt==1', {
11081109
'RuntimeLibrary': '3', # /MDd
11091110
}, {
11101111
'RuntimeLibrary': '1', # /MTd
@@ -1156,7 +1157,7 @@
11561157
'StringPooling': 'true',
11571158
'BasicRuntimeChecks': '0',
11581159
'conditions': [
1159-
['component=="shared_library"', {
1160+
['component=="shared_library" or force_dynamic_crt==1', {
11601161
'RuntimeLibrary': '3', #/MDd
11611162
}, {
11621163
'RuntimeLibrary': '1', #/MTd
@@ -1347,7 +1348,7 @@
13471348
'FavorSizeOrSpeed': '0',
13481349
'StringPooling': 'true',
13491350
'conditions': [
1350-
['component=="shared_library"', {
1351+
['component=="shared_library" or force_dynamic_crt==1', {
13511352
'RuntimeLibrary': '2', #/MD
13521353
}, {
13531354
'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 77
14+
#define V8_PATCH_LEVEL 78
1515

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

0 commit comments

Comments
 (0)