Changeset 4a60488 for libcfa/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:

• libcfa/configure (modified) (5 diffs)

libcfa/configure

@@ -707 +707 @@
 CONFIG_CFLAGS
 ARCH_FLAGS
+CFADIR_HASH
+LOCAL_CC1
+LOCAL_CFACC
 CFACPP
 CFACC
+ENABLE_DISTCC_FALSE
+ENABLE_DISTCC_TRUE
 CFA_VERSION
 DRIVER_DIR
@@ -783 +788 @@
 enable_option_checking
 enable_silent_rules
+enable_distcc
 with_cfa_name
 enable_shared
@@ -1445 +1451 @@
   --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-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -2941 +2948 @@
 
 
-CFACC=${DRIVER_DIR}cfa
+# Check whether --enable-distcc was given.
+if test "${enable_distcc+set}" = set; then :
+  enableval=$enable_distcc; enable_distcc=$enableval
+else
+  enable_distcc=no
+fi
+
+
+echo -n "checking for distributated build... "
+if test x$enable_distcc = xno; then
+        CFACC=${DRIVER_DIR}cfa
+        echo "no"
+else
+        tools="$(readlink -m $ac_confdir/)/../tools/build"
+        config=$(basename $(readlink -f .))
+        echo "$tools/distcc_hash $config"
+        CFADIR_HASH=$($tools/distcc_hash $config)
+        CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
+        echo "yes (hash=${CFADIR_HASH})"
+fi
 CFACPP=${DRIVER_DIR}cfa-cpp
+LOCAL_CFACC=${DRIVER_DIR}cfa
+LOCAL_CC1=${DRIVER_DIR}cc1
+
+ if test x$enable_distcc = xyes; then
+  ENABLE_DISTCC_TRUE=
+  ENABLE_DISTCC_FALSE='#'
+else
+  ENABLE_DISTCC_TRUE='#'
+  ENABLE_DISTCC_FALSE=
+fi
+
+
+
+
+
 
 
@@ -16982 +17023 @@
 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 "${BUILDLIB_TRUE}" && test -z "${BUILDLIB_FALSE}"; then
   as_fn_error $? "conditional \"BUILDLIB\" was never defined.