Changeset c59712e for driver


Ignore:
Timestamp:
Aug 3, 2018, 11:25:46 AM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
ff1e0f38
Parents:
25a9b5a
Message:

Parent make now seems to properly call libcfa

Location:
driver
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • driver/Makefile.am

    r25a9b5a rc59712e  
    1717# applies to both programs
    1818AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
    19 if BUILD_NO_LIB
    20 else
    21 AM_CXXFLAGS += -DHAVE_LIBCFA
    22 endif
    23 if BUILD_DEBUG
    24 AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
    25 endif
    26 if BUILD_RELEASE
    27 AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
    28 endif
    2919
    3020# don't install cfa directly
  • driver/Makefile.in

    r25a9b5a rc59712e  
    9292build_triplet = @build@
    9393host_triplet = @host@
    94 @BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
    95 @BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
    96 @BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
    9794noinst_PROGRAMS = cfa$(EXEEXT)
    9895cc1lib_PROGRAMS = cc1$(EXEEXT)
     
    222219LEXLIB = @LEXLIB@
    223220LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     221LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     222LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    224223LIBOBJS = @LIBOBJS@
    225224LIBS = @LIBS@
    226225LTLIBOBJS = @LTLIBOBJS@
    227 MACHINE_TYPE = @MACHINE_TYPE@
    228226MAKEINFO = @MAKEINFO@
    229227MKDIR_P = @MKDIR_P@
     
    241239SHELL = @SHELL@
    242240STRIP = @STRIP@
     241TARGET_HOSTS = @TARGET_HOSTS@
    243242VERSION = @VERSION@
    244243YACC = @YACC@
     
    298297
    299298# applies to both programs
    300 AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src \
    301         $(am__append_1) $(am__append_2) $(am__append_3)
     299AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
    302300cfa_SOURCES = cfa.cc
    303301
  • driver/cfa.cc

    r25a9b5a rc59712e  
    320320        nargs += 1;
    321321
    322         #ifdef HAVE_LIBCFA
    323322        if ( link ) {
    324                 #if ! defined(HAVE_LIBCFA_RELEASE)
    325                 if ( ! debug ) {
    326                         cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl;
    327                         exit( EXIT_FAILURE );
    328                 } // if
    329                 #endif
    330                 #if ! defined(HAVE_LIBCFA_DEBUG)
    331                 if ( debug ) {
    332                         cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
    333                         exit( EXIT_FAILURE );
    334                 } // if
    335                 #endif
    336 
    337323                args[nargs] = "-Xlinker";
    338324                nargs += 1;
     
    364350                nargs += 1;
    365351        } // if
    366         #endif // HAVE_LIBCFA
    367352
    368353        // Add exception flags (unconditionally)
Note: See TracChangeset for help on using the changeset viewer.