Changeset 417a630 for driver/cc1.cc

Timestamp:

Aug 26, 2019, 4:15:08 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b544afa

Parents:

5a43ab8

Message:

second attempt at moving cfa-cpp to cc1 stage 2

File:

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

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 26 07:52:19 2019
-// Update Count     : 374
+// Last Modified On : Mon Aug 26 14:21:22 2019
+// Update Count     : 375
 //
 
@@ -33 +33 @@
 
 
-static string installlibdir( CFA_LIBDIR );                              // fixed location of cc1 and cfa-cpp commands when installed
 static string compiler_path( CFA_BACKEND_CC );                  // path/name of C compiler
 static bool CFA_flag = false;                                                   // -CFA flag
 static bool save_temps = false;                                                 // -save-temps flag
 static string o_file;
+static string bprefix;
 
 
@@ -98 +98 @@
                         } else if ( prefix( val, "-o=" ) ) {            // output file for -CFA
                                 o_file = val.substr( 3 );
+                        } else if ( prefix( val, "-B=" ) ) {            // location of cfa-cpp
+                                bprefix = val.substr( 3 );
                         } else {
                                 args[nargs++] = ( *new string( arg.substr( __CFA_FLAGPREFIX__.size() + 4 ) ) ).c_str();
@@ -428 +430 @@
 
         if ( fork() == 0 ) {                                                            // child runs CFA
-                cargs[0] = ( *new string( installlibdir + "cfa-cpp" ) ).c_str();
+                cargs[0] = ( *new string( bprefix + "cfa-cpp" ) ).c_str();
                 cargs[ncargs++] = cpp_in;