Changes in driver/cc1.cc [d6f4488:bf71cfd]

File:

• driver/cc1.cc (modified) (5 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 23 09:48:40 2018
-// Update Count     : 122
+// Last Modified On : Thu Jul 19 10:46:11 2018
+// Update Count     : 111
 //
 
@@ -47 +47 @@
 const string suffixes[NumSuffixes] = { "cfa", "hfa", };
 
-
-void suffix( string arg, const char * args[], int & nargs ) {
+bool suffix( string arg ) {
         //std::cerr << arg << std::endl;
         size_t dot = arg.find_last_of( "." );
         //std::cerr << dot << " " << (dot != string::npos ? arg.substr( dot + 1 ) : "fred" ) << std::endl;
-        if ( dot == string::npos ) return;
+        if ( dot == string::npos ) return false;
         string sx = arg.substr( dot + 1 );
         for ( int i = 0; i < NumSuffixes; i += 1 ) {
-                if ( sx == suffixes[i] ) {
-                        args[nargs] = "-x";
-                        nargs += 1;
-                        args[nargs] = "c";
-                        nargs += 1;
-                        return;
-                } // if
-        } // for
+                if ( sx == suffixes[i] ) return true;
+        } // for
+        return false;
 } // suffix
 
 
-void checkEnv( const char * args[], int & nargs ) {
+void checkEnv( const char *args[], int &nargs ) {
         char *value;
 
-        value = getenv( "__CFA_COMPILER__" );
+        value = getenv( "__COMPILER__" );
         if ( value != NULL ) {
                 compiler_name = value;
@@ -269 +263 @@
 
                 args[0] = compiler_name.c_str();
-                suffix( cpp_in, args, nargs );                                  // check suffix
                 args[nargs] = cpp_in;
                 nargs += 1;
@@ -317 +310 @@
 
                 args[0] = compiler_name.c_str();
-                suffix( cpp_in, args, nargs );                                  // check suffix
+                if ( suffix( cpp_in ) ) {
+                        args[nargs] = "-x";
+                        nargs += 1;
+                        args[nargs] = "c";
+                        nargs += 1;
+                } // if
                 args[nargs] = cpp_in;                                                   // input to cpp
                 nargs += 1;
@@ -356 +354 @@
 
         if ( fork() == 0 ) {                                                            // child runs CFA
-                cargs[0] = ( *new string( bprefix + "cfa-cpp" ) ).c_str();
+                cargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
 
                 // Source file-name used to generate routine names containing global initializations for TU.