Changeset 0edebf8 for src/driver/cfa.cc


Ignore:
Timestamp:
Dec 13, 2016, 12:24:36 PM (5 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, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
04c8bba
Parents:
3d50aaf
Message:

cfa now properly selects correct library based on -debug option

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/driver/cfa.cc

    r3d50aaf r0edebf8  
    231231        } // if
    232232
    233         string d;
    234         if ( debug ) {
    235                 d = "-d";
    236         } // if
    237 
    238233        // add the CFA include-library paths, which allow direct access to header files without directory qualification
    239 
    240234        args[nargs] = "-I" CFA_INCDIR;
    241235        nargs += 1;
     
    249243        nargs += 1;
    250244
     245#ifdef HAVE_LIBCFA
    251246        if ( link ) {
     247                #if ! defined(HAVE_LIBCFA_RELEASE)
     248                        if( !debug ) {
     249                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
     250                                exit( EXIT_FAILURE );
     251                                }
     252                #endif
     253                #if ! defined(HAVE_LIBCFA_DEBUG)
     254                        if( debug ) {
     255                                cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
     256                                exit( EXIT_FAILURE );
     257                                }
     258                #endif
     259
    252260                // include the cfa library in case it's needed
    253261                args[nargs] = "-L" CFA_LIBDIR;
    254262                nargs += 1;
    255                 args[nargs] = "-lcfa";
    256                 nargs += 1;
    257         } // if
     263                if( debug ) {
     264                        args[nargs] = "-lcfa-d";
     265                } else {
     266                        args[nargs] = "-lcfa";
     267                }
     268                nargs += 1;
     269        } // if
     270#endif //HAVE_LIBCFA
    258271
    259272        // add the correct set of flags based on the type of compile this is
Note: See TracChangeset for help on using the changeset viewer.