Changeset d6f4488 for driver

Timestamp:

Aug 23, 2018, 11:06:16 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

9833cae0

Parents:

b740f0b

Message:

fix cfa -compiler flag

Location:

driver

Files:

• cc1.cc (modified) (2 diffs)
• cfa.cc (modified) (3 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 22 17:26:09 2018
-// Update Count     : 120
+// Last Modified On : Thu Aug 23 09:48:40 2018
+// Update Count     : 122
 //
 
@@ -69 +69 @@
         char *value;
 
-        value = getenv( "__COMPILER__" );
+        value = getenv( "__CFA_COMPILER__" );
         if ( value != NULL ) {
                 compiler_name = value;

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 22 17:26:19 2018
-// Update Count     : 265
+// Last Modified On : Thu Aug 23 09:42:47 2018
+// Update Count     : 267
 //
 
@@ -91 +91 @@
         string Major( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) );
 
-        string installincdir( CFA_INCDIR );                         // fixed location of include files
-        string installlibdir( CFA_LIBDIR );                         // fixed location of cc1 and cfa-cpp commands when installed
-        string srcdriverdir ( TOP_BUILDDIR "driver");                // fixed location of cc1 and cfa-cpp commands when in tree
+        string installincdir( CFA_INCDIR );                                     // fixed location of include files
+        string installlibdir( CFA_LIBDIR );                                     // fixed location of cc1 and cfa-cpp commands when installed
+        string srcdriverdir ( TOP_BUILDDIR "driver");           // fixed location of cc1 and cfa-cpp commands when in tree
 
         string heading;                                                                         // banner printed at start of cfa compilation
@@ -183 +183 @@
                                 if ( i == argc ) continue;                              // next argument available ?
                                 compiler_path = argv[i];
-                                if ( putenv( (char *)( *new string( string( "__U_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) {
+                                if ( putenv( (char *)( *new string( string( "__CFA_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) {
                                         cerr << argv[0] << " error, cannot set environment variable." << endl;
                                         exit( EXIT_FAILURE );