From f65ea0c5b50572926e11e03c91ebd45b760d073e Mon Sep 17 00:00:00 2001
From: Richard Viney <richard.viney@gmail.com>
Date: Fri, 18 Sep 2015 19:06:39 +1200
Subject: Fix PCHPDBFLAGS causing a deprecation warning on MSVC v8 and later
 when using PCHs and PDBs together

---
 src/engine/SCons/Tool/MSCommon/__init__.py | 3 ++-
 src/engine/SCons/Tool/msvc.py              | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/engine/SCons/Tool/MSCommon/__init__.py b/src/engine/SCons/Tool/MSCommon/__init__.py
index fe4a7c6..c87bf71 100644
--- a/src/engine/SCons/Tool/MSCommon/__init__.py
+++ b/src/engine/SCons/Tool/MSCommon/__init__.py
@@ -41,7 +41,8 @@ from SCons.Tool.MSCommon.sdk import mssdk_exists, \
 
 from SCons.Tool.MSCommon.vc import msvc_exists, \
                                    msvc_setup_env, \
-                                   msvc_setup_env_once
+                                   msvc_setup_env_once, \
+                                   msvc_version_to_maj_min
 
 from SCons.Tool.MSCommon.vs import get_default_version, \
                                    get_vs_by_version, \
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index 878ec6e..e6a9428 100644
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -47,7 +47,7 @@ import SCons.Util
 import SCons.Warnings
 import SCons.Scanner.RC
 
-from MSCommon import msvc_exists, msvc_setup_env_once
+from MSCommon import msvc_exists, msvc_setup_env_once, msvc_version_to_maj_min
 
 CSuffixes = ['.c', '.C']
 CXXSuffixes = ['.cc', '.cpp', '.cxx', '.c++', '.C++']
@@ -259,7 +259,12 @@ def generate(env):
     env['CFILESUFFIX'] = '.c'
     env['CXXFILESUFFIX'] = '.cc'
 
-    env['PCHPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Yd") or ""}'])
+    maj, min = msvc_version_to_maj_min(env['MSVC_VERSION'])
+    if maj < 8:
+        env['PCHPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Yd") or ""}'])
+    else:
+        env['PCHPDBFLAGS'] = ''
+
     env['PCHCOM'] = '$CXX /Fo${TARGETS[1]} $CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS $PCHPDBFLAGS'
     env['BUILDERS']['PCH'] = pch_builder
 
-- 
cgit v0.12


From 7f826db285f991f0c7b6332ba70642482fbe0381 Mon Sep 17 00:00:00 2001
From: Richard Viney <richard.viney@gmail.com>
Date: Sun, 10 Jul 2016 17:49:42 +1200
Subject: Added entry to src/CHANGES.txt

---
 src/CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index db52cf0..b6a9507 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -25,6 +25,10 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Added LoadableModule to the list of global functions (DefaultEnvironment
       builders).
 
+  From Richard Viney:
+    - Fixed PCHPDBFLAGS causing a deprecation warning on MSVC v8 and later when
+      using PCHs and PDBs together.
+
 RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
 
   From Dirk Baechle:
-- 
cgit v0.12