Skip to content

Commit 2bf4912

Browse files
author
bors-servo
authored
Auto merge of #197 - servo:jdm-patch-12, r=asajeffrey
Force VS 2017 to be used on Windows. This is important when there are multiple versions of VS installed that the build system might end up trying to use. 2017 is the only supported version for building SpiderMonkey. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/197) <!-- Reviewable:end -->
2 parents 9c0e589 + b405c03 commit 2bf4912

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

makefile.cargo

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ CONFIGURE_FLAGS := \
1414
ifeq (windows,$(findstring windows,$(TARGET)))
1515
WINDOWS := 1
1616
# Override any attempt to use the debug CRT when building with debug.
17-
CFLAGS += "-MD"
18-
CXXFLAGS += "-MD"
17+
CFLAGS += -MD
18+
CXXFLAGS += -MD
19+
CONFIGURE_FLAGS += --with-visual-studio-version=2017
1920
else
2021
WINDOWS :=
2122
endif

0 commit comments

Comments
 (0)