Changeset 919d1ba for configure.ac

Timestamp:

Jul 11, 2016, 5:20:08 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6f72453

Parents:

cad355a (diff), deefdc1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• configure.ac (modified) (3 diffs)

configure.ac

@@ -10 +10 @@
 
 if test "x${CXXFLAGS}" = "x"; then
-   export CXXFLAGS="-std=c++11 -g -O2 ${CXXFLAGS}"
+   export CXXFLAGS="-std=c++11 -g ${CXXFLAGS}"  # defaults, no -O2 for debugging and failures
 else
-   export CXXFLAGS="-std=c++11 ${CXXFLAGS}"
+   export CXXFLAGS="-std=c++11 ${CXXFLAGS}"     # flags from configure command
 fi
 
 AM_INIT_AUTOMAKE
-AM_MAINTAINER_MODE(enable)      # may require auto* software to be installed
+AM_MAINTAINER_MODE(enable)                      # may require auto* software to be installed
 
 # Installation paths
@@ -23 +23 @@
         [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
         backendcompiler=$withval, backendcompiler="")
-if test "x$backendcompiler" != x; then
+if test "x$backendcompiler" != "x"; then
         BACKEND_CC=${backendcompiler}
 else
-        AC_PATH_PROG(BACKEND_CC, gcc, [])
+        AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
         if test "x$BACKEND_CC" = "x"; then
                 AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
@@ -66 +66 @@
 AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
 AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
+
+AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
+AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
 
 # Checks for programs.