@@ -1670,7 +1670,6 @@ function ADD_SOURCES(dir, file_list, target, obj_dir)
16701670 var mangle_dir = k . replace ( new RegExp ( "[\\\\/.-]" , "g" ) , "_" ) ;
16711671 var bd_flags_name = "CFLAGS_BD_" + mangle_dir . toUpperCase ( ) ;
16721672
1673- DEFINE ( bd_flags_name , "/Fp" + sub_build + d + " /FR" + sub_build + d + " " ) ;
16741673 if ( VS_TOOLSET ) {
16751674 ADD_FLAG ( bd_flags_name , "/Fd" + sub_build + d ) ;
16761675 }
@@ -2474,15 +2473,12 @@ function handle_analyzer_makefile_flags(fd, key, val)
24742473
24752474 if ( "clang" == PHP_ANALYZER ) {
24762475 val = val . replace ( / \/ F D / , "" )
2477- . replace ( / \/ F p .+ ? / , "" )
24782476 . replace ( / \/ F o .+ ? / , "" )
24792477 . replace ( / \/ F d .+ ? / , "" )
24802478 //.replace(/\/Fd.+?/, " ")
2481- . replace ( / \/ F R .+ ? / , "" )
24822479 . replace ( "/guard:cf " , "" )
24832480 . replace ( / \/ M P \d + / , "" )
24842481 . replace ( / \/ M P / , "" )
2485- . replace ( "/LD " , "" )
24862482 . replace ( "/Qspectre " , "" ) ;
24872483 } else if ( "cppcheck" == PHP_ANALYZER ) {
24882484 new_val = "" ;
@@ -3449,7 +3445,7 @@ function toolset_setup_common_libs()
34493445function toolset_setup_build_mode ( )
34503446{
34513447 if ( PHP_DEBUG == "yes" ) {
3452- ADD_FLAG ( "CFLAGS" , "/LDd / MDd /Od /U NDebug /U NDEBUG /D ZEND_DEBUG=1 " +
3448+ ADD_FLAG ( "CFLAGS" , "/MDd /Od /U NDebug /U NDEBUG /D ZEND_DEBUG=1 " +
34533449 ( TARGET_ARCH == 'x86' ?"/ZI" :"/Zi" ) ) ;
34543450 ADD_FLAG ( "LDFLAGS" , "/debug" ) ;
34553451 // Avoid problems when linking to release libraries that use the release
@@ -3461,7 +3457,7 @@ function toolset_setup_build_mode()
34613457 ADD_FLAG ( "CFLAGS" , "/Zi" ) ;
34623458 ADD_FLAG ( "LDFLAGS" , "/incremental:no /debug /opt:ref,icf" ) ;
34633459 }
3464- ADD_FLAG ( "CFLAGS" , "/LD / MD" ) ;
3460+ ADD_FLAG ( "CFLAGS" , "/MD" ) ;
34653461 if ( PHP_SANITIZER == "yes" ) {
34663462 if ( VS_TOOLSET ) {
34673463 ADD_FLAG ( "CFLAGS" , "/Ox /U NDebug /U NDEBUG /D ZEND_DEBUG=1" ) ;
0 commit comments