Changeset 3d5701e for configure

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• configure (modified) (9 diffs)

configure

@@ -663 +663 @@
 ac_ct_DUMPBIN
 DUMPBIN
-LD
 FGREP
 EGREP
@@ -701 +700 @@
 LDFLAGS
 CXXFLAGS
-CXX
 CFA_FLAGS
 LIBCFA_TARGET_MAKEFILES
@@ -717 +715 @@
 BUILD_IN_TREE_FLAGS
 CFACPP
+CFACC_INSTALL
 CFACC
 DRIVER_DIR
@@ -723 +722 @@
 CFA_INCDIR
 CFA_PREFIX
+HAS_DISTCC
+LD
+CXX
+ENABLE_DISTCC_FALSE
+ENABLE_DISTCC_TRUE
 DOendif
 DOifskipcompile
@@ -797 +801 @@
 enable_silent_rules
 with_cfa_name
+enable_distcc
 with_target_hosts
 enable_gprofiler
@@ -1459 +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)
@@ -3184 +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
 
@@ -3266 +3304 @@
 DRIVER_DIR=${TOP_BUILDDIR}driver/
 CFACC=${DRIVER_DIR}cfa
+CFACC_INSTALL=${CFA_BINDIR}${CFA_NAME}
 CFACPP=${DRIVER_DIR}cfa-cpp
+
 
 
@@ -17017 +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.