Changeset faf8857 for src/main.cc

Timestamp:

Dec 17, 2015, 1:03:33 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

c23f807

Parents:

5e0fa1f

Message:

fix location of builtin.cf at configure, fifth attempt

File:

• src/main.cc (modified) (4 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec 17 07:26:03 2015
-// Update Count     : 171
+// Last Modified On : Thu Dec 17 12:59:06 2015
+// Update Count     : 179
 //
 
@@ -187 +187 @@
                 // read in the builtins and the prelude
                 if ( ! nopreludep ) {                                                   // include gcc builtins
-                        // -l is for initial build and builtins.cf is not in the lib directory yet so access it here.
-                        FILE * builtins = fopen( libcfap ? CFA_PREFIX "/src/libcfa" "/builtins.cf" : "libcfa/builtins.cf", "r" );
+                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
+                        FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
                                 std::cerr << "Error: can't open builtins" << std::endl;
@@ -197 +197 @@
 
                         if ( ! libcfap ) {
-                                // read the prelude in, if we're not generating the cfa library
+                                // read the prelude in, if not generating the cfa library
                                 FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
@@ -208 +208 @@
                 } // if
 
-                if ( libcfap ) {
-                        parse( input, LinkageSpec::Intrinsic ); 
-                } else {
-                        parse( input, LinkageSpec::Cforall, grammarp ); 
-                }
+                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );      
   
                 if ( parsep ) {