[lmi-commits] [lmi] odd/multiarch 29d9034 3/3: Merge remote-tracking branch 'origin/master' into odd/multiarch

[Greg Chicares]

branch: odd/multiarch
commit 29d9034bac5ce5968f565da5752a55ed6fc10e13
Merge: 1f60a0b e3a3984
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge remote-tracking branch 'origin/master' into odd/multiarch
---
 GNUmakefile    |  6 +++---
 bcc_5_5_1.make |  4 ++--
 como.make      |  4 ++--
 workhorse.make | 24 +++++++++++-------------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 2c17100..0385750 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -179,8 +179,8 @@ $(srcdir)/local_options.make:: ;
 # the make command line. Of course, other build types may be defined.
 
 build_type ?= ship
-toolset ?= gcc
-# Eventually prepend "$(toolset)-" to $(exec_prefix) .
+toolchain ?= gcc
+# Eventually prepend "$(toolchain)-" to $(exec_prefix) .
 build_dir := $(exec_prefix)/build/$(build_type)
 
 gpl_files := \
@@ -213,7 +213,7 @@ MAKETARGET = \
                  localincludedir='$(localincludedir)' \
                         test_dir='$(test_dir)' \
                   touchstone_dir='$(touchstone_dir)' \
-                         toolset='$(toolset)' \
+                       toolchain='$(toolchain)' \
                       build_type='$(build_type)' \
                USE_SO_ATTRIBUTES='$(USE_SO_ATTRIBUTES)' \
                     yyyymmddhhmm='$(yyyymmddhhmm)' \
diff --git a/bcc_5_5_1.make b/bcc_5_5_1.make
index 6e28b19..60d481c 100644
--- a/bcc_5_5_1.make
+++ b/bcc_5_5_1.make
@@ -19,7 +19,7 @@
 # email: <address@hidden>
 # snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-toolset      := bcc
+toolchain    := bcc
 
 srcdir       := $(CURDIR)
 
@@ -239,7 +239,7 @@ bcc_5_5_1.make:: ;
          --file=$(srcdir)/GNUmakefile \
          --jobs=1 \
                                     srcdir='$(srcdir)' \
-                                   toolset='$(toolset)' \
+                                 toolchain='$(toolchain)' \
                                gcc_version='$(gcc_version)' \
                                 C_WARNINGS='$(C_WARNINGS)' \
                               CXX_WARNINGS='$(CXX_WARNINGS)' \
diff --git a/como.make b/como.make
index 1f8eabe..619d3fc 100644
--- a/como.make
+++ b/como.make
@@ -33,7 +33,7 @@
 # Cf.:
 # http://www-d0.fnal.gov/KAI/doc/UserGuide/faq.html#multiple_template_instance
 
-toolset      := como
+toolchain    := como
 
 srcdir       := $(CURDIR)
 
@@ -222,7 +222,7 @@ CXX := \
          --jobs=1 \
                                gcc_version='$(gcc_version)' \
                                     srcdir='$(srcdir)' \
-                                   toolset='$(toolset)' \
+                                 toolchain='$(toolchain)' \
                                 C_WARNINGS='$(C_WARNINGS)' \
                               CXX_WARNINGS='$(CXX_WARNINGS)' \
                           C_EXTRA_WARNINGS='$(C_EXTRA_WARNINGS)' \
diff --git a/workhorse.make b/workhorse.make
index 541e676..79a30c5 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -131,11 +131,11 @@ effective_default_target: $(default_targets)
 # $(subst): workaround for debian, whose MinGW-w64 identifies its
 # version 7.x.0 as "7.x-win32".
 
-ifeq (gcc,$(toolset))
+ifeq (gcc,$(toolchain))
   gcc_version   := $(subst -win32,.0,$(shell $(CXX)     -dumpversion))
 endif
 
-# These are defined even for toolsets other than gcc.
+# These are defined even for toolchains other than gcc.
 
 gnu_cpp_version := $(subst -win32,.0,$(shell $(GNU_CPP) -dumpversion))
 gnu_cxx_version := $(subst -win32,.0,$(shell $(GNU_CXX) -dumpversion))
@@ -177,15 +177,13 @@ wx_dir := $(localbindir)
 wx_config_script := wx-config
 
 # The conventional autotools usage...
-ifeq (gcc,$(toolset))
-  wx_config_cxxflags := $(shell $(wx_config_script) --cxxflags)
-  wx_config_libs     := $(shell $(wx_config_script) --libs)
-  wx_config_basename := $(shell $(wx_config_script) --basename)
-  wx_config_version  := $(shell $(wx_config_script) --version)
-  # [variables used to construct the names of wxCode libraries]
-  wxcode_basename := $(shell echo $(wx_config_basename) | sed 's/^wx/wxcode/')
-  wxcode_version  := $(shell echo $(wx_config_version) | sed 's/\.[0-9]*$$//')
-endif
+wx_config_cxxflags := $(shell $(wx_config_script) --cxxflags)
+wx_config_libs     := $(shell $(wx_config_script) --libs)
+wx_config_basename := $(shell $(wx_config_script) --basename)
+wx_config_version  := $(shell $(wx_config_script) --version)
+# [variables used to construct the names of wxCode libraries]
+wxcode_basename := $(shell echo $(wx_config_basename) | sed 's/^wx/wxcode/')
+wxcode_version  := $(shell echo $(wx_config_version) | sed 's/\.[0-9]*$$//')
 # ...combines options that we prefer to keep separate.
 
 wx_include_paths := \
@@ -680,7 +678,7 @@ CXX_WARNINGS = \
 # speed penalty that can be overcome by increasing parallelism. There
 # seems to be no need for them with gcc-4.x, which uses less RAM.
 
-ifeq (gcc,$(toolset))
+ifeq (gcc,$(toolchain))
   ifeq (3.4.5,$(gcc_version))
     ggc_flags := --param ggc-min-expand=25 --param ggc-min-heapsize=32768
   endif
@@ -977,7 +975,7 @@ ALL_RCFLAGS  = $(REQUIRED_RCFLAGS)  $(RCFLAGS)
 # ELF symbol visibility, a feature for which significant benefits are
 # claimed:
 #   http://www.nedprod.com/programs/gccvisibility.html
-# And dll attributes would still be necessary for other toolsets,
+# And dll attributes would still be necessary for other toolchains,
 # which therefore aren't fully supported yet.
 #
 # However, 'libwx_new.a' continues to use classic dll attributes,