From 755c259b639050378159837facb5fbfa2447b3b8 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Wed, 18 Feb 2015 15:30:08 +0000
Subject: [PATCH] Remove a workaround for a compiler which is no longer
 supported.

---
 make/template/main.mk  | 6 +-----
 make/test/compiler.cpp | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/template/main.mk b/make/template/main.mk
index 39e2b1c23..9ac43e3bb 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -37,7 +37,7 @@ COMPILER = @COMPILER_NAME@
 SYSTEM = @SYSTEM_NAME@
 BUILDPATH ?= $(PWD)/build
 SOCKETENGINE = @SOCKETENGINE@
-CORECXXFLAGS = -fPIC -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow
+CORECXXFLAGS = -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow
 LDLIBS = -lstdc++
 CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
 PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
@@ -60,10 +60,6 @@ INSTMODE_LIB = 0640
 @ENDIF
 @ENDIF
 
-@IFNEQ $(SYSTEM)-$(COMPILER) darwin-GCC
-  CORECXXFLAGS += -fvisibility=hidden
-@ENDIF
-
 @IFNEQ $(SYSTEM) darwin
   LDLIBS += -pthread
 @ENDIF
diff --git a/make/test/compiler.cpp b/make/test/compiler.cpp
index ae782bf03..d78f07830 100644
--- a/make/test/compiler.cpp
+++ b/make/test/compiler.cpp
@@ -25,6 +25,10 @@
 # include <tr1/unordered_map>
 #endif
 
+#if defined __APPLE__ && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && __GNUC_PATCHLEVEL__ == 1
+# error "LLVM-GCC 4.2.1 has broken visibility support."
+#endif
+
 int main() {
 	std::cout << "Hello, World!" << std::endl;
 	return 0;
-- 
2.39.2