Skip to content

Commit 869dd66

Browse files
committed
Disables Thread-Safe for local static variables.
Fixes sass#1283.
1 parent cd70fbd commit 869dd66

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

appveyor.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
- node --version
3737
- npm --version
3838
- git submodule update --init --recursive
39-
- npm install --msvs_version=2015
39+
- npm config set msvs_version 2015 --global
40+
- npm install
4041

4142
test_script: npm test
4243

@@ -87,6 +88,7 @@
8788
- node --version
8889
- npm --version
8990
- git submodule update --init --recursive
90-
- npm install --msvs_version=2015
91+
- npm config set msvs_version 2015 --global
92+
- npm install
9193

9294
test_script: npm test

binding.gyp

+10
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@
6464
'MACOSX_DEPLOYMENT_TARGET': '10.7'
6565
}
6666
}],
67+
['OS=="win" and MSVS_VERSION == "2015"', {
68+
'msvs_settings': {
69+
'VCCLCompilerTool': {
70+
'AdditionalOptions': [
71+
# disable Thread-Safe "Magic" for local static variables
72+
'/Zc:threadSafeInit-',
73+
],
74+
},
75+
},
76+
}],
6777
['OS!="win"', {
6878
'cflags_cc+': [
6979
'-std=c++0x'

0 commit comments

Comments
 (0)