Fixed concurrent debug database file update as part of NARPLUGIN-123

2 files changed, 3 insertions, 0 deletions

diff --git a/PATCHES b/PATCHES
index 33f9787..009bd01 100644
--- a/PATCHES
+++ b/PATCHES
@@ -19,6 +19,7 @@
 ** Parallel running change
 - [src/net/sf/antcontrib/cpptasks/CCTask.java] fork of a process per core/cpu available.
 - [src/net/sf/antcontrib/cpptasks/TargetHistoryTable.java] protect againts multi-threaded updates.
+- [src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java] replaced /Zi flag with /Z7 to disable writing debug database file (.pdb).
 
 ** -fno-rtti changes
 - [src/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java] removed -fno-rtti flag
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
index 2502799..dc1afb3 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
@@ -72,6 +72,7 @@ public abstract class DevStudioCompatibleCCompiler
         }
         if (debug) {
             mindex += 1;
+// FREEHEP changed /Zi into /Z7
             args.addElement("/Zi");
             args.addElement("/Od");
             args.addElement("/GZ");
@@ -105,6 +106,7 @@ public abstract class DevStudioCompatibleCCompiler
             String lastInclude) {
         String[] additionalArgs = new String[]{
                 "/Fp" + CUtil.getBasename(prototype) + ".pch", "/Yc"};
+        // FREEHEP FIXME we may need /Yd here, but only in debug mode, how do we find out?
         return new CommandLineCompilerConfiguration(baseConfig, additionalArgs,
                 null, true);
     }