Changeset 35304009


Ignore:
Timestamp:
Dec 16, 2015, 10:11:54 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, 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:
8c0404e
Parents:
5f6c42c
Message:

fix location of builtin.cf at configure

Location:
src
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    r5f6c42c r35304009  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Thu Jun  4 22:49:16 2015
    14 ## Update Count     : 7
     13## Last Modified On : Wed Dec 16 21:46:43 2015
     14## Update Count     : 8
    1515###############################################################################
    1616
     
    4444
    4545libcfa-prelude.c : ${srcdir}/prelude.cf
    46         ${libdir}/cfa-cpp -l ${srcdir}/prelude.cf $@
     46        ${prefix}/src/cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    4747
    4848libcfa-prelude.o : libcfa-prelude.c
  • src/main.cc

    r5f6c42c r35304009  
    1010// Created On       : Fri May 15 23:12:02 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Nov 19 22:31:40 2015
    13 // Update Count     : 168
     12// Last Modified On : Wed Dec 16 21:44:41 2015
     13// Update Count     : 169
    1414//
    1515
     
    187187                // read in the builtins and the prelude
    188188                if ( ! nopreludep ) {                                                   // include gcc builtins
    189                         FILE * builtins = fopen( CFA_LIBDIR "/builtins.cf", "r" );
     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" : CFA_LIBDIR "/builtins.cf", "r" );
    190191                        if ( builtins == NULL ) {
    191192                                std::cerr << "Error: can't open builtins" << std::endl;
     
    203204                                } // if
    204205                   
    205                     parse( prelude, LinkageSpec::Intrinsic );
     206                                parse( prelude, LinkageSpec::Intrinsic );
    206207                        } // if
    207208                } // if
Note: See TracChangeset for help on using the changeset viewer.