Changeset 24f4671


Ignore:
Timestamp:
Dec 13, 2016, 10:53:21 AM (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:
3d50aaf
Parents:
2ee5426
Message:

Added defines to driver to enable debug/release modes (not implemented yet)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • configure

    r2ee5426 r24f4671  
    658658CFA_INCDIR
    659659CFA_PREFIX
     660BUILD_NO_LIB_FALSE
     661BUILD_NO_LIB_TRUE
    660662BUILD_DEBUG_FALSE
    661663BUILD_DEBUG_TRUE
     
    31463148                                ;;
    31473149                        no)
    3148                                 as_fn_error $? "Must build target debug or release" "$LINENO" 5
    3149                                 exit 1;
     3150                                build_release="no"
     3151                                build_debug="no"
    31503152                                ;;
    31513153                        *)
     
    31873189  BUILD_DEBUG_TRUE='#'
    31883190  BUILD_DEBUG_FALSE=
     3191fi
     3192
     3193 if test "x$build_release$build_debug" = "xnono"; then
     3194  BUILD_NO_LIB_TRUE=
     3195  BUILD_NO_LIB_FALSE='#'
     3196else
     3197  BUILD_NO_LIB_TRUE='#'
     3198  BUILD_NO_LIB_FALSE=
    31893199fi
    31903200
     
    63046314if test -z "${BUILD_DEBUG_TRUE}" && test -z "${BUILD_DEBUG_FALSE}"; then
    63056315  as_fn_error $? "conditional \"BUILD_DEBUG\" was never defined.
     6316Usually this means the macro was only invoked conditionally." "$LINENO" 5
     6317fi
     6318if test -z "${BUILD_NO_LIB_TRUE}" && test -z "${BUILD_NO_LIB_FALSE}"; then
     6319  as_fn_error $? "conditional \"BUILD_NO_LIB\" was never defined.
    63066320Usually this means the macro was only invoked conditionally." "$LINENO" 5
    63076321fi
     
    76727686fi
    76737687else
     7688  if test -z "$BUILD_DEBUG_TRUE"; then :
    76747689  { $as_echo "$as_me:${as_lineno-$LINENO}: Building libcfa for target: debug" >&5
    76757690$as_echo "$as_me: Building libcfa for target: debug" >&6;}
     7691else
     7692  { $as_echo "$as_me:${as_lineno-$LINENO}: Running cfa without libcfa" >&5
     7693$as_echo "$as_me: Running cfa without libcfa" >&6;}
     7694fi
    76767695fi
    76777696
  • configure.ac

    r2ee5426 r24f4671  
    8282                                ;;
    8383                        no)
    84                                 AC_MSG_ERROR(Must build target debug or release)
    85                                 exit 1;
     84                                build_release="no"
     85                                build_debug="no"
    8686                                ;;
    8787                        *)
     
    111111AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
    112112AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
     113AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
    113114
    114115if test "x$prefix" = "xNONE"; then
     
    200201                [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
    201202                [AC_MSG_NOTICE(Building libcfa for target: release)])],
    202         [AC_MSG_NOTICE(Building libcfa for target: debug)])
     203        [AM_COND_IF([BUILD_DEBUG],
     204                [AC_MSG_NOTICE(Building libcfa for target: debug)],
     205                [AC_MSG_NOTICE(Running cfa without libcfa)])])
    203206
    204207# Final text
  • src/driver/Makefile.am

    r2ee5426 r24f4671  
    1717# applies to both programs
    1818AM_CXXFLAGS = -Wall -O2
     19if BUILD_NO_LIB
     20else
     21AM_CXXFLAGS += -DHAVE_LIBCFA
     22endif
     23if BUILD_DEBUG
     24AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
     25endif
     26if BUILD_RELEASE
     27AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
     28endif
    1929
    2030bin_PROGRAMS = cfa
  • src/driver/Makefile.in

    r2ee5426 r24f4671  
    3838build_triplet = @build@
    3939host_triplet = @host@
     40@BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
     41@BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
     42@BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
    4043bin_PROGRAMS = cfa$(EXEEXT)
    4144cc1lib_PROGRAMS = cc1$(EXEEXT)
     
    204207
    205208# applies to both programs
    206 AM_CXXFLAGS = -Wall -O2
     209AM_CXXFLAGS = -Wall -O2 $(am__append_1) $(am__append_2) \
     210        $(am__append_3)
    207211cfa_SOURCES = cfa.cc
    208212
Note: See TracChangeset for help on using the changeset viewer.