Changeset 3f414ef

Timestamp:

Mar 9, 2017, 2:50:54 PM (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:

5222605

Parents:

0e7ea335

Message:

configure now properly adds -m32/-m64 based on canonical build and host

Files:

• configure (modified) (4 diffs)
• configure.ac (modified) (1 diff)

configure

@@ -644 +644 @@
 CXXFLAGS
 CXX
+CFA_FLAGS
 MACHINE_TYPE
 host_os
@@ -653 +654 @@
 build_cpu
 build
-CFA_FLAGS
 CFA_LIBDIR
 CFA_BINDIR
@@ -3302 +3302 @@
 
 
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_FLAGS "${CFAFLAGS}"
-_ACEOF
-
-CFA_FLAGS=${CFAFLAGS}
-
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -3382 +3374 @@
 
 MACHINE_TYPE=$host_cpu
+
+
+echo $build_cpu
+echo $host_cpu
+
+if ! test "$host_cpu" = "$build_cpu"; then
+        case $host_cpu in
+                i386)
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
+                        ;;
+                i686)
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
+                        ;;
+                x86_64)
+                        CFLAGS+="-m64"
+                        CXXFLAGS+="-m64"
+                        CFAFLAGS+="-m64"
+                        LDFLAGS+="-m64"
+                        ;;
+        esac
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_FLAGS "${CFAFLAGS}"
+_ACEOF
+
+CFA_FLAGS=${CFAFLAGS}
 
 

configure.ac

@@ -169 +169 @@
 AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_SUBST([MACHINE_TYPE],[$host_cpu])
+
+echo $build_cpu
+echo $host_cpu
+
+if ! test "$host_cpu" = "$build_cpu"; then 
+        case $host_cpu in
+                i386)
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
+                        ;;
+                i686)
+                        CFLAGS+="-m32"
+                        CXXFLAGS+="-m32"
+                        CFAFLAGS+="-m32"
+                        LDFLAGS+="-m32"
+                        ;;
+                x86_64)
+                        CFLAGS+="-m64"
+                        CXXFLAGS+="-m64"
+                        CFAFLAGS+="-m64"
+                        LDFLAGS+="-m64"
+                        ;;
+        esac
+fi
+
 AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
 AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
-
-AC_CANONICAL_HOST
-AC_SUBST([MACHINE_TYPE],[$host_cpu])
 
 # Checks for programs.