@@ -1670,7 +1670,6 @@ function ADD_SOURCES(dir, file_list, target, obj_dir)
1670
1670
var mangle_dir = k . replace ( new RegExp ( "[\\\\/.-]" , "g" ) , "_" ) ;
1671
1671
var bd_flags_name = "CFLAGS_BD_" + mangle_dir . toUpperCase ( ) ;
1672
1672
1673
- DEFINE ( bd_flags_name , "/Fp" + sub_build + d + " /FR" + sub_build + d + " " ) ;
1674
1673
if ( VS_TOOLSET ) {
1675
1674
ADD_FLAG ( bd_flags_name , "/Fd" + sub_build + d ) ;
1676
1675
}
@@ -2474,15 +2473,12 @@ function handle_analyzer_makefile_flags(fd, key, val)
2474
2473
2475
2474
if ( "clang" == PHP_ANALYZER ) {
2476
2475
val = val . replace ( / \/ F D / , "" )
2477
- . replace ( / \/ F p .+ ? / , "" )
2478
2476
. replace ( / \/ F o .+ ? / , "" )
2479
2477
. replace ( / \/ F d .+ ? / , "" )
2480
2478
//.replace(/\/Fd.+?/, " ")
2481
- . replace ( / \/ F R .+ ? / , "" )
2482
2479
. replace ( "/guard:cf " , "" )
2483
2480
. replace ( / \/ M P \d + / , "" )
2484
2481
. replace ( / \/ M P / , "" )
2485
- . replace ( "/LD " , "" )
2486
2482
. replace ( "/Qspectre " , "" ) ;
2487
2483
} else if ( "cppcheck" == PHP_ANALYZER ) {
2488
2484
new_val = "" ;
@@ -3449,7 +3445,7 @@ function toolset_setup_common_libs()
3449
3445
function toolset_setup_build_mode ( )
3450
3446
{
3451
3447
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 " +
3453
3449
( TARGET_ARCH == 'x86' ?"/ZI" :"/Zi" ) ) ;
3454
3450
ADD_FLAG ( "LDFLAGS" , "/debug" ) ;
3455
3451
// Avoid problems when linking to release libraries that use the release
@@ -3461,7 +3457,7 @@ function toolset_setup_build_mode()
3461
3457
ADD_FLAG ( "CFLAGS" , "/Zi" ) ;
3462
3458
ADD_FLAG ( "LDFLAGS" , "/incremental:no /debug /opt:ref,icf" ) ;
3463
3459
}
3464
- ADD_FLAG ( "CFLAGS" , "/LD / MD" ) ;
3460
+ ADD_FLAG ( "CFLAGS" , "/MD" ) ;
3465
3461
if ( PHP_SANITIZER == "yes" ) {
3466
3462
if ( VS_TOOLSET ) {
3467
3463
ADD_FLAG ( "CFLAGS" , "/Ox /U NDebug /U NDEBUG /D ZEND_DEBUG=1" ) ;
0 commit comments