Changeset 149d297 for configure

Timestamp:

Mar 9, 2017, 10:47:08 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

68ac32e, a9b657a

Parents:

6152c81 (diff), 7b2c2c5f (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

File:

• configure (modified) (7 diffs)

configure

@@ -644 +644 @@
 CXXFLAGS
 CXX
+CFA_FLAGS
 MACHINE_TYPE
 host_os
@@ -653 +654 @@
 build_cpu
 build
-CFA_FLAGS
 CFA_LIBDIR
 CFA_BINDIR
@@ -742 +742 @@
 enable_silent_rules
 enable_maintainer_mode
+with_cfa_name
 with_backend_compiler
 enable_target_release
@@ -1398 +1399 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-cfa-name=NAME     NAME too which cfa will be installed
   --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible)
 
@@ -3003 +3005 @@
 
 # Allow program name tansformation
-# will fille program_transform_name with appropriate sed regex
-
-#autoconf escapes $ and \ since automake wiill un-escape them.
-#Since we need to use the sed transform in autoconf we need to manualy un-escape these characters
-name_transform=`echo ${program_transform_name} | sed 's/\\$\\$/\\$/g' | sed 's/\\\\\\\/\\\/g'`
-cfa_name=`echo cfa | sed ${name_transform}`
-cc1_name=`echo cc1 | sed ${name_transform}`
-cpp_name=`echo cfa-cpp | sed ${name_transform}`
+# will fill program_transform_name with appropriate sed regex
+
 
 #Trasforming cc1 will break compilation
-if ! test "${cc1_name}" = "cc1"; then
-    as_fn_error $? "Program transform must not modify cc1.
-                --program-sufix and --program-prefix not supported.
-                Use -program-transform-name='s/cfa$/[Desired name here]/' instead" "$LINENO" 5
-fi
-#We could support transforming cfa-cpp but since it is located in a unique subfolder we don't need to
-if ! test "${cpp_name}" = "cfa-cpp"; then
-    as_fn_error $? "Program transform must not modify cfa-cpp.
-                --program-sufix and --program-prefix not supported.
-                Use -program-transform-name='s/cfa$/[Desired name here]/' instead" "$LINENO" 5
-fi
+if test "${program_transform_name}" = ""; then
+    as_fn_error $? "Program transform not supported.
+                Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
+fi
+
+
+# Check whether --with-cfa-name was given.
+if test "${with_cfa_name+set}" = set; then :
+  withval=$with_cfa_name; cfa_name=$withval
+else
+  cfa_name="cfa"
+fi
+
 
 #Define the new name of the installed command
@@ -3304 +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 ||
@@ -3384 +3374 @@
 
 MACHINE_TYPE=$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}