Changeset 375a068 for src/main.cc

Timestamp:

Dec 14, 2016, 3:31:01 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

74e5a3aa

Parents:

37efaf56

Message:

move builtin/prelude into different directory

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 30 10:11:38 2016
-// Update Count     : 435
+// Last Modified On : Wed Dec 14 14:35:54 2016
+// Update Count     : 436
 //
 
@@ -178 +178 @@
                 if ( ! nopreludep ) {                                                   // include gcc builtins
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
-                        FILE * builtins = fopen( libcfap | treep ? "builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                        FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         assertf( builtins, "cannot open builtins.cf\n" );
                         parse( builtins, LinkageSpec::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
-                        FILE * extras = fopen( libcfap | treep ? "extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
+                        FILE * extras = fopen( libcfap | treep ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
                         assertf( extras, "cannot open extras.cf\n" );
                         parse( extras, LinkageSpec::C );
@@ -189 +189 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
+                                FILE * prelude = fopen( treep ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 assertf( prelude, "cannot open prelude.cf\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );