Changeset faf8857 for src/main.cc


Ignore:
Timestamp:
Dec 17, 2015, 1:03:33 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
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, resolv-new, string, with_gc
Children:
c23f807
Parents:
5e0fa1f
Message:

fix location of builtin.cf at configure, fifth attempt

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/main.cc

    r5e0fa1f rfaf8857  
    1010// Created On       : Fri May 15 23:12:02 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Dec 17 07:26:03 2015
    13 // Update Count     : 171
     12// Last Modified On : Thu Dec 17 12:59:06 2015
     13// Update Count     : 179
    1414//
    1515
     
    187187                // read in the builtins and the prelude
    188188                if ( ! nopreludep ) {                                                   // include gcc builtins
    189                         // -l is for initial build and builtins.cf is not in the lib directory yet so access it here.
    190                         FILE * builtins = fopen( libcfap ? CFA_PREFIX "/src/libcfa" "/builtins.cf" : "libcfa/builtins.cf", "r" );
     189                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
     190                        FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
    191191                        if ( builtins == NULL ) {
    192192                                std::cerr << "Error: can't open builtins" << std::endl;
     
    197197
    198198                        if ( ! libcfap ) {
    199                                 // read the prelude in, if we're not generating the cfa library
     199                                // read the prelude in, if not generating the cfa library
    200200                                FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
    201201                                if ( prelude == NULL ) {
     
    208208                } // if
    209209
    210                 if ( libcfap ) {
    211                         parse( input, LinkageSpec::Intrinsic );
    212                 } else {
    213                         parse( input, LinkageSpec::Cforall, grammarp );
    214                 }
     210                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );     
    215211 
    216212                if ( parsep ) {
Note: See TracChangeset for help on using the changeset viewer.