Changeset 4a60488 for configure

Timestamp:

Sep 27, 2019, 3:35:46 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

90ce35aa

Parents:

8e1467d (diff), 849720f (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:

Merged from master taking the lvalue changes to expression and everything before that.

File:

• configure (modified) (16 diffs)

configure

@@ -637 +637 @@
 LIBOBJS
 CFA_BACKEND_CC
+DEMANGLER
+LIBDEMANGLE
 WITH_LIBTCMALLOC_FALSE
 WITH_LIBTCMALLOC_TRUE
@@ -661 +663 @@
 ac_ct_DUMPBIN
 DUMPBIN
-LD
 FGREP
 EGREP
@@ -699 +700 @@
 LDFLAGS
 CXXFLAGS
-CXX
 CFA_FLAGS
 LIBCFA_TARGET_MAKEFILES
@@ -715 +715 @@
 BUILD_IN_TREE_FLAGS
 CFACPP
+CFACC_INSTALL
 CFACC
 DRIVER_DIR
@@ -721 +722 @@
 CFA_INCDIR
 CFA_PREFIX
+HAS_DISTCC
+LD
+CXX
+ENABLE_DISTCC_FALSE
+ENABLE_DISTCC_TRUE
 DOendif
 DOifskipcompile
@@ -795 +801 @@
 enable_silent_rules
 with_cfa_name
+enable_distcc
 with_target_hosts
 enable_gprofiler
+enable_demangler
 enable_dependency_tracking
 enable_shared
@@ -1456 +1464 @@
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-distcc     whether or not to enable distributed compilation
   --enable-gprofiler     whether or not to enable gprofiler tools (if available)
+  --enable-demangler     whether or not to build the demangler (executable and library)
   --enable-dependency-tracking
                           do not reject slow dependency extractors
@@ -3180 +3190 @@
 
 #==============================================================================
+# distcc support
+
+# Check whether --enable-distcc was given.
+if test "${enable_distcc+set}" = set; then :
+  enableval=$enable_distcc; enable_distcc=$enableval
+else
+  enable_distcc=no
+fi
+
+
+ if test x$enable_distcc = xyes; then
+  ENABLE_DISTCC_TRUE=
+  ENABLE_DISTCC_FALSE='#'
+else
+  ENABLE_DISTCC_TRUE='#'
+  ENABLE_DISTCC_FALSE=
+fi
+
+HAS_DISTCC="False"
+
+if test x$enable_distcc = xyes; then
+        CXX="distcc ${CXX}"
+        LD="distcc ${LD} -lstdc++"
+        HAS_DISTCC="True"
+        echo "Enabling distributed builds"
+fi
+
+
+
+
+
+#==============================================================================
 # Installation paths
 
@@ -3262 +3304 @@
 DRIVER_DIR=${TOP_BUILDDIR}driver/
 CFACC=${DRIVER_DIR}cfa
+CFACC_INSTALL=${CFA_BINDIR}${CFA_NAME}
 CFACPP=${DRIVER_DIR}cfa-cpp
+
 
 
@@ -3401 +3445 @@
 
 
+# Check whether --enable-demangler was given.
+if test "${enable_demangler+set}" = set; then :
+  enableval=$enable_demangler; enable_demangler=$enableval
+else
+  enable_demangler=yes
+fi
+
+
 TARGET_HOSTS=${target_hosts}
 
@@ -3433 +3485 @@
                 "x86-64"     ) cannon_arch_name="x64";;
                 "x86_64"     ) cannon_arch_name="x64";;
+                "aarch64"    ) cannon_arch_name="arm";;
                 "x86"        ) cannon_arch_name="x86";;
                 "i386"       ) cannon_arch_name="x86";;
@@ -3442 +3495 @@
                 "armv7l"     ) cannon_arch_name="arm";;
                 *)
-                >&2 echo "Unkown architecture " $arch_name;
+                >&2 echo "Unknown architecture " $arch_name;
                 exit 1
                 ;;
@@ -3474 +3527 @@
                 "x86-64"     ) cannon_arch_name="x64";;
                 "x86_64"     ) cannon_arch_name="x64";;
+                "aarch64"    ) cannon_arch_name="arm";;
                 "x86"        ) cannon_arch_name="x86";;
                 "i386"       ) cannon_arch_name="x86";;
@@ -3483 +3537 @@
                 "armv7l"     ) cannon_arch_name="arm";;
                 *)
-                >&2 echo "Unkown architecture " $arch_name;
+                >&2 echo "Unknown architecture " $arch_name;
                 exit 1
                 ;;
@@ -16778 +16832 @@
 
 
+# conditionnally build the demangler
+if test "x$enable_demangler" == xyes; then
+        LIBDEMANGLE="libdemangle.a"
+        DEMANGLER="demangler"
+else
+        LIBDEMANGLE=""
+        DEMANGLER=""
+fi
+
+
+
 # Checks for header files.
 for ac_header in libintl.h malloc.h unistd.h
@@ -16992 +17057 @@
 fi
 
+if test -z "${ENABLE_DISTCC_TRUE}" && test -z "${ENABLE_DISTCC_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_DISTCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.