@@ -791,17 +791,9 @@ int process_jam_log( const std::vector<std::string> & args )
791
791
792
792
// these actions represent both the start of a new action
793
793
// and the end of a failed action
794
- else if ( line_start.find ( " C++-action" ) != string::npos
795
- || line_start.find ( " vc-C++" ) != string::npos
796
- || line_start.find ( " C-action" ) != string::npos
797
- || line_start.find ( " Cc-action" ) != string::npos
798
- || line_start.find ( " vc-Cc" ) != string::npos
799
- || line_start.find ( " .compile." ) != string::npos
800
- || line_start.find ( " compile-" ) != string::npos
801
- || line_start.find ( " -compile" ) != string::npos
802
- || line_start.find ( " Link-action" ) != string::npos
803
- || line_start.find ( " vc-Link" ) != string::npos
804
- || line_start.find ( " Archive-action" ) != string::npos
794
+ else if ( line_start.find ( " .compile." ) != string::npos
795
+ || line_start.find ( " compile-c-c++" ) != string::npos // msvc
796
+ || line_start.find ( " compile-fortran" ) != string::npos // xlf
805
797
|| line_start.find ( " .archive" ) != string::npos
806
798
|| ( line_start.find ( " .link" ) != string::npos &&
807
799
// .linkonce is present in gcc linker messages about
@@ -817,10 +809,7 @@ int process_jam_log( const std::vector<std::string> & args )
817
809
// ~ return 1;
818
810
// ~ }
819
811
820
- string action ( ( line_start.find ( " Link-action" ) != string::npos
821
- || line_start.find ( " vc-Link" ) != string::npos
822
- || line_start.find ( " Archive-action" ) != string::npos
823
- || line_start.find ( " .archive" ) != string::npos
812
+ string action ( ( line_start.find ( " .archive" ) != string::npos
824
813
|| line_start.find ( " .link" ) != string::npos
825
814
)
826
815
? " link" : " compile"
0 commit comments