aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-11-28 00:17:08 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-11-28 00:17:08 +0200
commit509afe752c5f1c17b703f86ea40542ed75237993 (patch)
treee7c64c29a23c53f4db95f8b2d271efb8a5c0dc47 /mesonbuild
parent7f9bd8d2711fb1633ba9356add42f5a48c3ad2b3 (diff)
downloadmeson-509afe752c5f1c17b703f86ea40542ed75237993.zip
meson-509afe752c5f1c17b703f86ea40542ed75237993.tar.gz
meson-509afe752c5f1c17b703f86ea40542ed75237993.tar.bz2
Use /O1 instead of /Os for MSVC as the latter is deprecated.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/vs2010backend.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 125d043..ea52f12 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -730,8 +730,9 @@ class Vs2010Backend(backends.Backend):
ET.SubElement(type_config, 'InlineFunctionExpansion').text = 'OnlyExplicitInline'
elif '/Ob2' in o_flags:
ET.SubElement(type_config, 'InlineFunctionExpansion').text = 'AnySuitable'
- # Size-preserving flags
- if '/Os' in o_flags:
+ # In modern MSVC parlance "/O1" means size optimization.
+ # "/Os" has been deprecated.
+ if '/O1' in o_flags:
ET.SubElement(type_config, 'FavorSizeOrSpeed').text = 'Size'
else:
ET.SubElement(type_config, 'FavorSizeOrSpeed').text = 'Speed'