Merge pull request #1106 from SaberUK/master+purge-pkg-path

[user/henk/code/inspircd.git] / make / template / main.mk

diff --git a/make/template/main.mk b/make/template/main.mk
index 521888beadedae4bbaad4dbeadceaeefcb52a016..3e7ee184401c60e2f19f5af167454634b0d93178 100644 (file)
--- 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
@@ -93,7 +89,7 @@ INSTMODE_LIB = 0640
 
 DBGOK=0
 @IFEQ $(D) 0
-  CORECXXFLAGS += -O2
+  CORECXXFLAGS += -fno-rtti -O2
 @IFEQ $(COMPILER) GCC
     CORECXXFLAGS += -g1
 @ENDIF
@@ -101,12 +97,12 @@ DBGOK=0
   DBGOK=1
 @ENDIF
 @IFEQ $(D) 1
-  CORECXXFLAGS += -O0 -g3 -Werror
+  CORECXXFLAGS += -O0 -g3 -Werror -DINSPIRCD_ENABLE_RTTI
   HEADER = debug-header
   DBGOK=1
 @ENDIF
 @IFEQ $(D) 2
-  CORECXXFLAGS += -O2 -g3
+  CORECXXFLAGS += -fno-rtti -O2 -g3
   HEADER = debug-header
   DBGOK=1
 @ENDIF
@@ -118,14 +114,11 @@ FOOTER = finishmessage
 @TARGET BSD_MAKE SOURCEPATH != /bin/pwd
 
 @IFDEF V
-  RUNCC = $(CXX)
-  RUNLD = $(CXX)
   VERBOSE = -v
 @ELSE
   @TARGET GNU_MAKE MAKEFLAGS += --silent
   @TARGET BSD_MAKE MAKE += -s
-  RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CXX)
-  RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CXX)
+  VERBOSE =
 @ENDIF
 
 @IFDEF PURE_STATIC
@@ -136,7 +129,7 @@ FOOTER = finishmessage
 # things like -Wfatal-errors if they wish to.
 CORECXXFLAGS += $(CXXFLAGS)
 
-@DO_EXPORT RUNCC RUNLD CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
 @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC
 
 # Default target