Changeset 37fe352 for automake

Timestamp:

Aug 5, 2018, 4:11:41 PM (6 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:

• automake/cfa.m4 (modified) (1 diff)

automake/cfa.m4

@@ -26 +26 @@
 
         if test "$libdir" = '${exec_prefix}/lib'; then
-                cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+                cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
         else
-                cfa_libdir=${libdir}
+                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
         fi
         AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
         AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
 ])
+
+m4_define([M4CFA_PROGRAM_NAME], [
+        if test "${program_transform_name}" = ""; then
+        AC_MSG_ERROR([Program transform not supported.
+                        Use --with-cfa-name='[[Desired name here]]' instead])
+        fi
+
+        #Define the new name of the installed command
+        AC_ARG_WITH(cfa-name,
+                [  --with-cfa-name=NAME     NAME too which cfa will be installed],
+                cfa_name=$withval, cfa_name="cfa")
+
+        AC_SUBST(CFA_NAME, ${cfa_name})
+])
+
+AC_DEFUN([M4CFA_CANNON_CPU], [
+        case $arch_name in
+                "x64"        ) cannon_arch_name="x64";;
+                "x86-64"     ) cannon_arch_name="x64";;
+                "x86_64"     ) cannon_arch_name="x64";;
+                "x86"        ) cannon_arch_name="x86";;
+                "i386"       ) cannon_arch_name="x86";;
+                "i486"       ) cannon_arch_name="x86";;
+                "i686"       ) cannon_arch_name="x86";;
+                "Intel 80386") cannon_arch_name="x86";;
+                "arm"        ) cannon_arch_name="arm";;
+                "ARM"        ) cannon_arch_name="arm";;
+                *)
+                >&2 echo "Unkown architecture " $arch_name;
+                exit 1
+                ;;
+        esac
+])