Changeset faf8857


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, 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

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • configure

    r5e0fa1f rfaf8857  
    29992999        cfa_incdir="${cfa_prefix}/include"
    30003000else
    3001         cfa_incdir=${$includedir}
     3001        cfa_incdir=${includedir}
    30023002fi
    30033003
  • configure.ac

    r5e0fa1f rfaf8857  
    4141        cfa_incdir="${cfa_prefix}/include"
    4242else
    43         cfa_incdir=${$includedir}
     43        cfa_incdir=${includedir}
    4444fi
    4545AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
  • src/Makefile.in

    r5e0fa1f rfaf8857  
    413413          esac; \
    414414        done; \
    415         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
     415        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
    416416        $(am__cd) $(top_srcdir) && \
    417           $(AUTOMAKE) --gnu src/Makefile
     417          $(AUTOMAKE) --foreign src/Makefile
    418418.PRECIOUS: Makefile
    419419Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • src/driver/Makefile.in

    r5e0fa1f rfaf8857  
    195195          esac; \
    196196        done; \
    197         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/driver/Makefile'; \
     197        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/driver/Makefile'; \
    198198        $(am__cd) $(top_srcdir) && \
    199           $(AUTOMAKE) --gnu src/driver/Makefile
     199          $(AUTOMAKE) --foreign src/driver/Makefile
    200200.PRECIOUS: Makefile
    201201Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • src/examples/Makefile.in

    r5e0fa1f rfaf8857  
    191191          esac; \
    192192        done; \
    193         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/examples/Makefile'; \
     193        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \
    194194        $(am__cd) $(top_srcdir) && \
    195           $(AUTOMAKE) --gnu src/examples/Makefile
     195          $(AUTOMAKE) --foreign src/examples/Makefile
    196196.PRECIOUS: Makefile
    197197Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • src/libcfa/Makefile.in

    r5e0fa1f rfaf8857  
    220220          esac; \
    221221        done; \
    222         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcfa/Makefile'; \
     222        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcfa/Makefile'; \
    223223        $(am__cd) $(top_srcdir) && \
    224           $(AUTOMAKE) --gnu src/libcfa/Makefile
     224          $(AUTOMAKE) --foreign src/libcfa/Makefile
    225225.PRECIOUS: Makefile
    226226Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • 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.