1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 3b5dbb3616..f1102aa44e 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -370,9 +370,12 @@ sub cflags {
 
     if ($self->{CAPI}) {
         $self->{CCFLAGS} =~ s/-DPERL_OBJECT(\s|$)//;
-        $self->{CCFLAGS} =~ s/-TP(\s|$)//;
-        $self->{OPTIMIZE} =~ s/-TP(\s|$)//;
         $self->{CCFLAGS} .= '-DPERL_CAPI';
+        if ($Is_Win32 && $Config{'cc'} =~ /^cl.exe/i) {
+            # Turn off C++ mode of the MSC compiler
+            $self->{CCFLAGS} =~ s/-TP(\s|$)//;
+            $self->{OPTIMIZE} =~ s/-TP(\s|$)//;
+        }
     }
     return $self->{CFLAGS} = qq{
 CCFLAGS = $self->{CCFLAGS}