summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjuj <jujjyl@gmail.com>2019-01-10 13:28:33 +0200
committerGitHub <noreply@github.com>2019-01-10 13:28:33 +0200
commite71506165996f7a12cd54361761bc88c7f883cd2 (patch)
tree0217f59c177ffef6fef54eeeaaf093f42929aa00
parent58f3579974855fe7e4ca3b8ebd7b1f83a4e4dc68 (diff)
parente8ac331501c91373a77967a5f609b0912aa05fc4 (diff)
downloadbinaryen-e71506165996f7a12cd54361761bc88c7f883cd2.tar.gz
binaryen-e71506165996f7a12cd54361761bc88c7f883cd2.tar.bz2
binaryen-e71506165996f7a12cd54361761bc88c7f883cd2.zip
Merge pull request #1823 from juj/fix_vs2017_15.8_build
Fix Visual Studio 2017 15.8 build
-rw-r--r--CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa8548536..8c1401ad5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,9 @@ IF(MSVC)
ADD_NONDEBUG_COMPILE_FLAG("/O2")
ADD_COMPILE_FLAG("/D_CRT_SECURE_NO_WARNINGS")
ADD_COMPILE_FLAG("/D_SCL_SECURE_NO_WARNINGS")
+ # Visual Studio 2018 15.8 implemented conformant support for std::aligned_storage, but the conformant support is only enabled when the following flag is passed, to avoid
+ # breaking backwards compatibility with code that relied on the non-conformant behavior (the old nonconformant behavior is not used with Binaryen)
+ ADD_COMPILE_FLAG("/D_ENABLE_EXTENDED_ALIGNED_STORAGE")
# Don't warn about using "strdup" as a reserved name.
ADD_COMPILE_FLAG("/D_CRT_NONSTDC_NO_DEPRECATE")