Skip to content

Commit 4d4c503

Browse files
committed
Remove obsolete action name patterns. Refs #44.
1 parent 49a04b6 commit 4d4c503

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

common/src/process_jam_log.cpp

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -791,17 +791,9 @@ int process_jam_log( const std::vector<std::string> & args )
791791

792792
// these actions represent both the start of a new action
793793
// 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
805797
|| line_start.find( ".archive") != string::npos
806798
|| ( line_start.find( ".link") != string::npos &&
807799
// .linkonce is present in gcc linker messages about
@@ -817,10 +809,7 @@ int process_jam_log( const std::vector<std::string> & args )
817809
//~ return 1;
818810
//~ }
819811

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
824813
|| line_start.find( ".link") != string::npos
825814
)
826815
? "link" : "compile"

0 commit comments

Comments
 (0)