[lmi-commits] [lmi] valyuta/002 53eefda 2/2: Merge branch 'master' into valyuta/002

[Greg Chicares]

branch: valyuta/002
commit 53eefdaf4755e5e6503e4e0ab91380452bcdc108
Merge: 7192581 e73c066
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Merge branch 'master' into valyuta/002
---
 lmi_setup_20.sh | 1 +
 workhorse.make  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lmi_setup_20.sh b/lmi_setup_20.sh
index a896705..83725c5 100755
--- a/lmi_setup_20.sh
+++ b/lmi_setup_20.sh
@@ -91,6 +91,7 @@ apt-get --assume-yes install \
   git \
   jing \
   libarchive-tools \
+  libc6-dbg \
   libtool \
   libxml2-utils \
   libxslt1-dev \
diff --git a/workhorse.make b/workhorse.make
index 9b2aa89..43ff2f9 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -158,6 +158,7 @@ else ifeq (8.2.0,$(gnu_cpp_version))
 else ifeq (8.3.0,$(gnu_cpp_version))
 else ifeq (9,$(gnu_cpp_version))
 else ifeq (9.3.0,$(gnu_cpp_version))
+else ifeq (10,$(gnu_cpp_version))
 else ifeq (10.0,$(gnu_cpp_version))
 else
   $(warning Untested $(GNU_CPP) version '$(gnu_cpp_version)')
@@ -175,6 +176,7 @@ else ifeq (8.2.0,$(gnu_cxx_version))
 else ifeq (8.3.0,$(gnu_cxx_version))
 else ifeq (9,$(gnu_cxx_version))
 else ifeq (9.3.0,$(gnu_cxx_version))
+else ifeq (10,$(gnu_cpp_version))
 else ifeq (10.0,$(gnu_cxx_version))
 else
   $(warning Untested $(GNU_CXX) version '$(gnu_cxx_version)')