Changeset 6385d62 for src/main.cc


Ignore:
Timestamp:
Jun 26, 2017, 1:05:58 PM (7 years ago)
Author:
Aaron Moss <a3moss@…>
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:
16c95e3, fea3faa
Parents:
f7b9faf (diff), 807ce84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/main.cc

    rf7b9faf r6385d62  
    186186                if ( ! nopreludep ) {                                                   // include gcc builtins
    187187                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
     188                        // Read to cfa builtins, if not generating the cfa library
    188189                        FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
    189190                        assertf( builtins, "cannot open builtins.cf\n" );
    190191                        parse( builtins, LinkageSpec::Compiler );
     192
     193                        // Read to gcc builtins, if not generating the cfa library
     194                        FILE * gcc_builtins = fopen( libcfap | treep ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
     195                        assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
     196                        parse( gcc_builtins, LinkageSpec::Compiler );
    191197
    192198                        // read the extra prelude in, if not generating the cfa library
Note: See TracChangeset for help on using the changeset viewer.