Changes in configure [bbfd0e0:a8d4b59]

File:

• configure (modified) (9 diffs)

configure

@@ -663 +663 @@
 ac_ct_DUMPBIN
 DUMPBIN
+LD
 FGREP
 EGREP
@@ -700 +701 @@
 LDFLAGS
 CXXFLAGS
+CXX
 CFA_FLAGS
 LIBCFA_TARGET_MAKEFILES
@@ -721 +723 @@
 CFA_INCDIR
 CFA_PREFIX
-LD
-CXX
-ENABLE_DISTCC_FALSE
-ENABLE_DISTCC_TRUE
 DOendif
 DOifskipcompile
@@ -799 +797 @@
 enable_silent_rules
 with_cfa_name
-enable_distcc
 with_target_hosts
 enable_gprofiler
@@ -1462 +1459 @@
   --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)
@@ -3188 +3184 @@
 
 #==============================================================================
-# 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
-
-
-if test x$enable_distcc = xyes; then
-        CXX="distcc ${CXX}"
-        LD="distcc ${LD} -lstdc++"
-        echo "Enabling distributed builds"
-fi
-
-
-
-
-#==============================================================================
 # Installation paths
 
@@ -3478 +3445 @@
                 "x86-64"     ) cannon_arch_name="x64";;
                 "x86_64"     ) cannon_arch_name="x64";;
-                "aarch64"    ) cannon_arch_name="x64";;
+                "aarch64"    ) cannon_arch_name="arm";;
                 "x86"        ) cannon_arch_name="x86";;
                 "i386"       ) cannon_arch_name="x86";;
@@ -3520 +3487 @@
                 "x86-64"     ) cannon_arch_name="x64";;
                 "x86_64"     ) cannon_arch_name="x64";;
-                "aarch64"    ) cannon_arch_name="x64";;
+                "aarch64"    ) cannon_arch_name="arm";;
                 "x86"        ) cannon_arch_name="x86";;
                 "i386"       ) cannon_arch_name="x86";;
@@ -17050 +17017 @@
 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.