Changeset 4ec769c

Timestamp:

Jul 14, 2017, 12:19:34 PM (7 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:

8cb529e

Parents:

0764cfb

Message:

Removed error when specifying both flags and host

Files:

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

configure

@@ -3471 +3471 @@
         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

configure.ac

@@ -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