From f978bc2417574ddc6bf70aef6a85d33387106307 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 12 Nov 2018 13:44:22 +0200
Subject: Remove explicit /Oi MSVC option that's implied by /O2

---
 BOOTSTRAP-MSVC.cli | 4 ++--
 UPGRADE.cli        | 8 ++++----
 build-msvc.bat     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/BOOTSTRAP-MSVC.cli b/BOOTSTRAP-MSVC.cli
index 873947f..75af7d0 100644
--- a/BOOTSTRAP-MSVC.cli
+++ b/BOOTSTRAP-MSVC.cli
@@ -127,7 +127,7 @@ the \c{configure} and \c{install} command lines above along these lines:
 \
 > build2\build2\b-boot configure ^
   config.cxx=cl                  ^
-  \"config.cc.coptions=/O2 /Oi\"   ^
+  config.cc.coptions=/O2         ^
   config.install.root=C:\build2
 
 > build2\build2\b-boot install: build2/ bpkg/ bdep/
@@ -150,7 +150,7 @@ previous step and you may want/need to make similar adjustments.
 > bpkg-stage create             ^
   cc                            ^
   config.cxx=cl                 ^
-  \"config.cc.coptions=/O2 /Oi\"  ^
+  config.cc.coptions=/O2        ^
   config.install.root=C:\build2
 \
 
diff --git a/UPGRADE.cli b/UPGRADE.cli
index 6730e6d..92f46ef 100644
--- a/UPGRADE.cli
+++ b/UPGRADE.cli
@@ -177,10 +177,10 @@ config.install.sudo=sudo
 For Windows with MSVC (from the Visual Studio command prompt):
 
 \
-> bpkg-stage create              ^
-  cc                             ^
-  config.cxx=cl                  ^
-  \"config.cc.coptions=/O2 /Oi\"   ^
+> bpkg-stage create             ^
+  cc                            ^
+  config.cxx=cl                 ^
+  config.cc.coptions=/O2        ^
   config.install.root=C:\build2
 \
 
diff --git a/build-msvc.bat b/build-msvc.bat
index 778dbb0..9487de6 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -249,7 +249,7 @@ cd %cdir%
 bpkg-stage %verbose% create^
  cc^
  config.cxx=%cxx%^
- "config.cc.coptions=/O2 /Oi"^
+ config.cc.coptions=/O2^
  config.install.root=%idir%
 @if errorlevel 1 goto error
 
-- 
cgit v1.1