Changeset 37fe352 for libcfa/configure

Timestamp:

Aug 5, 2018, 4:11:41 PM (5 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

28582b2

Parents:

4dcaed2

Message:

Added proper multi-lib handling, tests still do not work and arm support is broken

File:

• libcfa/configure (modified) (12 diffs)

libcfa/configure

@@ -622 +622 @@
 CFA_INCDIR
 CFA_PREFIX
+CFA_NAME
+ARCH_FLAGS
 CFACPP
 CFACC
 DRIVER_DIR
 CONFIGURATION
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
+ARCHITECTURE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
@@ -704 +699 @@
 enable_option_checking
 enable_silent_rules
+with_cfa_name
 enable_dependency_tracking
 '
@@ -709 +705 @@
 host_alias
 target_alias
+ARCHITECTURE
 CONFIGURATION
 DRIVER_DIR
@@ -1333 +1330 @@
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
@@ -1357 +1350 @@
                           speeds up one-time build
 
+Optional Packages:
+  --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
+
 Some influential environment variables:
+  ARCHITECTURE
+              The architecture to use when building libcfa
   CONFIGURATION
               The configuration to use when building libcfa, options are:
@@ -1911 +1911 @@
 
 
+
+
+
+
+
+
+
 am__api_version='1.15'
 
@@ -2495 +2502 @@
 
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
 
 
@@ -2575 +2511 @@
 
 
+case $ARCHITECTURE in
+        "x64"        ) ARCH_FLAGS="-m64";;
+        "x86"        ) ARCH_FLAGS="-m32";;
+        "arm"        ) ARCH_FLAGS="";;
+esac
+
+
+
+#==============================================================================
+#Trasforming cc1 will break compilation
+
+        if test "${program_transform_name}" = ""; then
+        as_fn_error $? "Program transform not supported.
+                        Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
+        fi
+
+        #Define the new name of the installed command
+
+# 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
+
+
+        CFA_NAME=${cfa_name}
+
+
+
 #==============================================================================
 # Installation paths
-if test "x$prefix" = "xNONE"; then
-        cfa_prefix=${ac_default_prefix}
-else
-        cfa_prefix=${prefix}
-fi
+
+        if test "x$prefix" = "xNONE"; then
+                cfa_prefix=${ac_default_prefix}
+        else
+                cfa_prefix=${prefix}
+        fi
 
 cat >>confdefs.h <<_ACEOF
@@ -2587 +2554 @@
 _ACEOF
 
-CFA_PREFIX=${cfa_prefix}
-
-
-if test "$includedir" = '${prefix}/include'; then
-        cfa_incdir="${cfa_prefix}/include/${cfa_name}"
-else
-        cfa_incdir=${includedir}
-fi
+        CFA_PREFIX=${cfa_prefix}
+
+
+        if test "$includedir" = '${prefix}/include'; then
+                cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+        else
+                cfa_incdir=${includedir}
+        fi
 
 cat >>confdefs.h <<_ACEOF
@@ -2600 +2567 @@
 _ACEOF
 
-CFA_INCDIR=${cfa_incdir}
-
-
-if test "$bindir" = '${exec_prefix}/bin'; then
-        cfa_bindir="${cfa_prefix}/bin"
-else
-        cfa_bindir=${bindir}
-fi
+        CFA_INCDIR=${cfa_incdir}
+
+
+        if test "$bindir" = '${exec_prefix}/bin'; then
+                cfa_bindir="${cfa_prefix}/bin"
+        else
+                cfa_bindir=${bindir}
+        fi
 
 cat >>confdefs.h <<_ACEOF
@@ -2613 +2580 @@
 _ACEOF
 
-CFA_BINDIR=${cfa_bindir}
-
-
-if test "$libdir" = '${exec_prefix}/lib'; then
-        cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
-else
-        cfa_libdir=${libdir}
-fi
+        CFA_BINDIR=${cfa_bindir}
+
+
+        if test "$libdir" = '${exec_prefix}/lib'; then
+                cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
+        else
+                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
+        fi
 
 cat >>confdefs.h <<_ACEOF
@@ -2626 +2593 @@
 _ACEOF
 
-CFA_LIBDIR=${cfa_libdir}
+        CFA_LIBDIR=${cfa_libdir}
+