[lmi-commits] [lmi] master e3a3984 6/6: Eliminate an undesirable conditional

[Greg Chicares]

branch: master
commit e3a398407c79b6fb5875748a0f9d59b0db396cff
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Eliminate an undesirable conditional
    
    Perhaps this was somehow useful with ancient toolchains that weren't
    used with wx, but for clang it would certainly be wrong. Makefiles for
    some really starry toolchains are retained just in case they contain
    anything that helps with clang, even though they're just chepooka now.
---
 workhorse.make | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index 2346bb7..79a30c5 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -177,15 +177,13 @@ wx_dir := $(localbindir)
 wx_config_script := wx-config
 
 # The conventional autotools usage...
-ifeq (gcc,$(toolchain))
-  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 := \