Changeset 81e60f7 for driver

Timestamp:

Sep 10, 2019, 5:03:23 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

8209e70

Parents:

c2051e10

Message:

Fixed small merge problems

File:

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

driver/cfa.cc ¶

@@ -33 +33 @@
 using std::to_string;
 
-//#define __DEBUG_H__
+// #define __DEBUG_H__
 
 static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );               // "N__=" suffix
@@ -345 +345 @@
 
         if(disttree) {
-                Putenv( argv, "--prelude-dir=" + dir(argv[0])) );
+                Putenv( argv, "--prelude-dir=" + dir(argv[0]) );
         } else if(intree) {
-                Putenv( argv, "--prelude-dir=" + libdir + "/prelude") );
-        } else {
-                Putenv( argv, "--prelude-dir=" + libdir) );
+                Putenv( argv, "--prelude-dir=" + libdir + "/prelude" );
+        } else {
+                Putenv( argv, "--prelude-dir=" + libdir );
         }
-        nargs += 1;
+
         for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
                 args[nargs++] = libs[i];
@@ -402 +402 @@
         } // if
 
-        Putenv( argv, "--prelude-dir=" + libdir + (intree ? "/prelude" : "") );
-
         if ( debug ) {
                 heading += " (debug)";
@@ -420 +418 @@
                 }
                 if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
-                Putenv( argv, ( *new string( string("-B=") + bprefix ) ).c_str() );
+                Putenv( argv, string("-B=") + bprefix );
         } // if