Changeset b826e6b for configure.ac

Timestamp:

Jul 19, 2017, 11:49:33 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct, with_gc

Children:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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

@@ -9 +9 @@
 AM_SILENT_RULES([no])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE(enable)                      # may require auto* software to be installed
 
@@ -167 +167 @@
 AC_SUBST([MACHINE_TYPE],[$host_cpu])
 
-if ! test "$host_cpu" = "$build_cpu"; then 
+if ! test "$host_cpu" = "$build_cpu"; then
         case $host_cpu in
                 i386)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
+                        CFLAGS+=" -m32 "
+                        CXXFLAGS+=" -m32 "
+                        CFAFLAGS+=" -m32 "
+                        LDFLAGS+=" -m32 "
                         ;;
                 i686)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
+                        CFLAGS+=" -m32 "
+                  CXXFLAGS+=" -m32 "
+                  CFAFLAGS+=" -m32 "
+                  LDFLAGS+=" -m32 "
                         ;;
                 x86_64)
-                        CFLAGS+="-m64"
-                        CXXFLAGS+="-m64"
-                        CFAFLAGS+="-m64"
-                        LDFLAGS+="-m64"
+                        CFLAGS+=" -m64 "
+                        CXXFLAGS+=" -m64 "
+                        CFAFLAGS+=" -m64 "
+                        LDFLAGS+=" -m64 "
                         ;;
         esac
@@ -238 +238 @@
         src/prelude/Makefile
         src/libcfa/Makefile
+        tools/prettyprinter/Makefile
         ])