Changeset c59712e for configure.ac

Timestamp:

Aug 3, 2018, 11:25:46 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

ff1e0f38

Parents:

25a9b5a

Message:

Parent make now seems to properly call libcfa

File:

• configure.ac (modified) (10 diffs)

configure.ac

@@ -15 +15 @@
 AC_ARG_PROGRAM
 
+#==============================================================================
 #Trasforming cc1 will break compilation
 if test "${program_transform_name}" = ""; then
@@ -21 +22 @@
 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")
 
-#Define the new name of the installed command
 AC_SUBST(CFA_NAME, ${cfa_name})
+
+#==============================================================================
+# handle the list of hosts to build for
+for var in $ac_configure_args
+do
+        #strip quotes surrouding values
+        var=$(echo $var | sed s/\'//g)
+        case $var in
+                # skip cross compilation related arguments
+                --host=*) ;; host_alias=*) ;; --build=*) ;; build_alias=*) ;; --target=*) ;; target_alias=*) ;;
+
+                # append all other arguments to the sub configure arguments
+                *) LIBCFA_GENERAL_ARGS="${LIBCFA_GENERAL_ARGS} $var";;
+        esac
+done
+
+echo $LIBCFA_GENERAL_ARGS
+
+#==============================================================================
+# handle the list of hosts to build for
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
+default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
+AC_ARG_WITH(target-hosts,
+        [  --with-target-hosts=HOSTS     HOSTS comma seperated list of hosts to build for, format ARCH:[debug|nodebug|nolib]],
+        target_hosts=$withval, target_hosts=${default_target})
+
+AC_SUBST(TARGET_HOSTS, ${target_hosts})
+
+for i in $(echo $target_hosts | sed "s/,/ /g")
+do
+        # call your procedure/other scripts here below
+        lib_arch=$(echo $i | sed -r "s/:(.*)//g")
+        lib_config=$(echo $i | sed -r "s/(.*)://g")
+        lib_dir="libcfa-${lib_arch}-${lib_config}"
+
+        LIBCFA_TARGET_DIRS="${LIBCFA_TARGET_DIRS} ${lib_dir}"
+        LIBCFA_TARGET_MAKEFILES="${LIBCFA_TARGET_MAKEFILES} ${lib_dir}/Makefile"
+
+        mkdir -p libcfa-${lib_arch}-${lib_config}
+        echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
+        echo -n "--host=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
+        echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
+done
+
+AC_SUBST(LIBCFA_TARGET_DIRS)
+AC_SUBST(LIBCFA_TARGET_MAKEFILES)
+
+
+#==============================================================================
+# version information
 
 rm -f version
@@ -46 +99 @@
 AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ["${ver_major}.${ver_minor}.${ver_patch}.${ver_build}"], [Major.Minor.Patch.Build])
 
-# Installation paths
-
-AC_ARG_WITH(backend-compiler,
-        [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
-        backendcompiler=$withval, backendcompiler="")
-if test "x$backendcompiler" != "x"; then
-        BACKEND_CC=${backendcompiler}
-else
-        AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
-        if test "x$BACKEND_CC" = "x"; then
-                AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
-                exit 1
-        fi
-fi
-AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
-AC_SUBST(CFA_BACKEND_CC)
-
-
-
-AC_ARG_ENABLE(target-release, AS_HELP_STRING([--enable-target-release], [Build and install the release target]))
-AC_ARG_ENABLE(target-debug, AS_HELP_STRING([--enable-target-debug], [Build and install the debug target]))
-AC_ARG_ENABLE(threading, AS_HELP_STRING([--enable-threading], [Build and install libcfa with threading support (Enabled by default)]),
-[case "${enableval}" in
-  yes) build_threading="yes" ;;
-  no)  build_threading="no" ;;
-  *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
-esac],[build_threading="yes"])
-
-case "$enable_target_release" in
-        yes)
-                case "$enable_target_debug" in
-                        yes)
-                                build_release="yes"
-                                build_debug="yes"
-                                ;;
-                        no)
-                                build_release="yes"
-                                build_debug="no"
-                                ;;
-                        *)
-                                build_release="yes"
-                                build_debug="no"
-                                ;;
-                esac
-                ;;
-        no)
-                case "$enable_target_debug" in
-                        yes)
-                                build_release="no"
-                                build_debug="yes"
-                                ;;
-                        no)
-                                build_release="no"
-                                build_debug="no"
-                                ;;
-                        *)
-                                build_release="no"
-                                build_debug="yes"
-                                ;;
-                esac
-                ;;
-        *)
-                case "$enable_target_debug" in
-                        yes)
-                                build_release="no"
-                                build_debug="yes"
-                                ;;
-                        no)
-                                build_release="yes"
-                                build_debug="no"
-                                ;;
-                        *)
-                                build_release="yes"
-                                build_debug="yes"
-                                ;;
-                esac
-                ;;
-esac
-
-AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
-AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
-AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
-AM_CONDITIONAL([BUILD_CONCURRENCY], [test "x$build_threading" = "xyes"])
-
+#==============================================================================
+# HACK to be able to use conditionnals inside makefiles
 DOifskipcompile='ifeq ($(skipcompile),yes)
 else'
@@ -139 +110 @@
 AM_SUBST_NOTMAKE([DOendif])
 
+#==============================================================================
+# backend compiler implementation
+AC_ARG_WITH(backend-compiler,
+       [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
+       backendcompiler=$withval, backendcompiler="")
+if test "x$backendcompiler" != "x"; then
+       BACKEND_CC=${backendcompiler}
+else
+       AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
+       if test "x$BACKEND_CC" = "x"; then
+               AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
+               exit 1
+       fi
+fi
+AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
+AC_SUBST(CFA_BACKEND_CC)
+
+#==============================================================================
+# Installation paths
 if test "x$prefix" = "xNONE"; then
         cfa_prefix=${ac_default_prefix}
@@ -171 +161 @@
 AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
 
+#==============================================================================
 # Create variables for commonly used targets
 DRIVER_DIR='$(top_builddir)/driver'
@@ -182 +173 @@
 AC_DEFINE_UNQUOTED(PRELUDE_BUILDDIR, "$ac_pwd/libcfa/prelude/", [Directory where the prelude files are built])
 
+#==============================================================================
 # Flag variables needed to build in tree
 LIBCFA_SRC='$(top_srcdir)/libcfa/src'
@@ -190 +182 @@
 AC_SUBST(BUILD_IN_TREE_FLAGS)
 
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_SUBST([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
-
+#==============================================================================
+# CAFLAGS
 AC_DEFINE_UNQUOTED(CFA_FLAGS, "${CFAFLAGS}", [compilation flags for cfa libraries and test programs.])
 AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
 
+#==============================================================================
 # Checks for programs.
 AC_PROG_CXX
@@ -255 +223 @@
 AC_CHECK_FUNCS([memset putenv strchr strtol])
 
+#==============================================================================
 AC_CONFIG_FILES([
         Makefile
@@ -262 +231 @@
         tests/Makefile
         tests/preempt_longrun/Makefile
-        libcfa/prelude/Makefile
-        libcfa/src/Makefile
         tools/Makefile
         tools/prettyprinter/Makefile
@@ -272 +239 @@
 AC_OUTPUT(tests/config.py)
 
-AM_COND_IF([BUILD_RELEASE],
-        [AM_COND_IF([BUILD_DEBUG],
-                [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
-                [AC_MSG_NOTICE(Building libcfa for target: release)])],
-        [AM_COND_IF([BUILD_DEBUG],
-                [AC_MSG_NOTICE(Building libcfa for target: debug)],
-                [AC_MSG_NOTICE(Running cfa without libcfa)])])
-
 # Final text
 AC_MSG_RESULT(Cforall configuraton completed. Type "make -j 8 install".)