Changeset 05e6eb5 for src/main.cc


Ignore:
Timestamp:
Jul 30, 2018, 4:43:48 PM (3 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
5cbacf1
Parents:
fd2debf
git-author:
Rob Schluntz <rschlunt@…> (07/30/18 15:38:10)
git-committer:
Rob Schluntz <rschlunt@…> (07/30/18 16:43:48)
Message:

Warn about constructor/destructor priorities 101-200 only when not building the library

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/main.cc

    rfd2debf r05e6eb5  
    183183
    184184                        // Read to gcc builtins, if not generating the cfa library
    185                         FILE * gcc_builtins = fopen( libcfap | treep ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
     185                        FILE * gcc_builtins = fopen( buildingLibrary() ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
    186186                        assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
    187187                        parse( gcc_builtins, LinkageSpec::Compiler );
    188188
    189189                        // read the extra prelude in, if not generating the cfa library
    190                         FILE * extras = fopen( libcfap | treep ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
     190                        FILE * extras = fopen( buildingLibrary() ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
    191191                        assertf( extras, "cannot open extras.cf\n" );
    192192                        parse( extras, LinkageSpec::BuiltinC );
     
    194194                        if ( ! libcfap ) {
    195195                                // read the prelude in, if not generating the cfa library
    196                                 FILE * prelude = fopen( treep ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
     196                                FILE * prelude = fopen( buildingLibrary() ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
    197197                                assertf( prelude, "cannot open prelude.cf\n" );
    198198                                parse( prelude, LinkageSpec::Intrinsic );
    199199
    200200                                // Read to cfa builtins, if not generating the cfa library
    201                                 FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
     201                                FILE * builtins = fopen( buildingLibrary() ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
    202202                                assertf( builtins, "cannot open builtins.cf\n" );
    203203                                parse( builtins, LinkageSpec::BuiltinCFA );
     
    274274
    275275                // fix ObjectDecl - replaces ConstructorInit nodes
    276                 PASS( "fixInit", InitTweak::fix( translationUnit, libcfap || treep ) );
     276                PASS( "fixInit", InitTweak::fix( translationUnit, buildingLibrary() ) );
    277277                if ( ctorinitp ) {
    278278                        dump ( translationUnit );
Note: See TracChangeset for help on using the changeset viewer.