Changeset 24f4671

Timestamp:

Dec 13, 2016, 10:53:21 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3d50aaf

Parents:

2ee5426

Message:

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

Files:

• configure (modified) (5 diffs)
• configure.ac (modified) (3 diffs)
• src/driver/Makefile.am (modified) (1 diff)
• src/driver/Makefile.in (modified) (2 diffs)

configure ¶

@@ -658 +658 @@
 CFA_INCDIR
 CFA_PREFIX
+BUILD_NO_LIB_FALSE
+BUILD_NO_LIB_TRUE
 BUILD_DEBUG_FALSE
 BUILD_DEBUG_TRUE
@@ -3146 +3148 @@
                                 ;;
                         no)
-                                as_fn_error $? "Must build target debug or release" "$LINENO" 5
-                                exit 1;
+                                build_release="no"
+                                build_debug="no"
                                 ;;
                         *)
@@ -3187 +3189 @@
   BUILD_DEBUG_TRUE='#'
   BUILD_DEBUG_FALSE=
+fi
+
+ if test "x$build_release$build_debug" = "xnono"; then
+  BUILD_NO_LIB_TRUE=
+  BUILD_NO_LIB_FALSE='#'
+else
+  BUILD_NO_LIB_TRUE='#'
+  BUILD_NO_LIB_FALSE=
 fi
 
@@ -6304 +6314 @@
 if test -z "${BUILD_DEBUG_TRUE}" && test -z "${BUILD_DEBUG_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_NO_LIB_TRUE}" && test -z "${BUILD_NO_LIB_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_NO_LIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@@ -7672 +7686 @@
 fi
 else
+  if test -z "$BUILD_DEBUG_TRUE"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: Building libcfa for target: debug" >&5
 $as_echo "$as_me: Building libcfa for target: debug" >&6;}
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Running cfa without libcfa" >&5
+$as_echo "$as_me: Running cfa without libcfa" >&6;}
+fi
 fi
 

configure.ac ¶

@@ -82 +82 @@
                                 ;;
                         no)
-                                AC_MSG_ERROR(Must build target debug or release)
-                                exit 1;
+                                build_release="no"
+                                build_debug="no"
                                 ;;
                         *)
@@ -111 +111 @@
 AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
 AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
+AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
 
 if test "x$prefix" = "xNONE"; then
@@ -200 +201 @@
                 [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
                 [AC_MSG_NOTICE(Building libcfa for target: release)])],
-        [AC_MSG_NOTICE(Building libcfa for target: debug)])
+        [AM_COND_IF([BUILD_DEBUG],
+                [AC_MSG_NOTICE(Building libcfa for target: debug)],
+                [AC_MSG_NOTICE(Running cfa without libcfa)])])
 
 # Final text

src/driver/Makefile.am ¶

@@ -17 +17 @@
 # applies to both programs
 AM_CXXFLAGS = -Wall -O2
+if BUILD_NO_LIB
+else
+AM_CXXFLAGS += -DHAVE_LIBCFA
+endif
+if BUILD_DEBUG
+AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
+endif
+if BUILD_RELEASE
+AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
+endif
 
 bin_PROGRAMS = cfa

src/driver/Makefile.in ¶

@@ -38 +38 @@
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
+@BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
+@BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
 bin_PROGRAMS = cfa$(EXEEXT)
 cc1lib_PROGRAMS = cc1$(EXEEXT)
@@ -204 +207 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2
+AM_CXXFLAGS = -Wall -O2 $(am__append_1) $(am__append_2) \
+        $(am__append_3)
 cfa_SOURCES = cfa.cc