Small Makefile tweaks

Set gcc as default compiler on Linux, also compile
with symbols stripped to shrink binary file.

Original patch by Heinz van Saanen.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/Makefile b/src/Makefile
index f700a4441e4f55d141645bb494cb1a8ee4cdd36a..5e27f9e72788f8ab14f10cf79d8ccbb2f68c1d41 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,9 +44,8 @@ clean:
 ### Compiler:
 ###
 
-# CXX = g++
-# CXX = g++-4.2
-CXX = icpc
+CXX = g++
+# CXX = icpc
 
 
 ###
@@ -66,24 +65,25 @@ include .depend
 ### Compiler and linker switches
 ###
 
-# Enable/disable debugging:
+# Enable/disable debugging, disabled by default
 
 CXXFLAGS += -DNDEBUG
 
 
-# Compile with full warnings, and symbol names
+# Compile with full warnings, and symbol names stripped, you can use
+# -g instead of -s to compile symbol's table in, useful for debugging.
 
-CXXFLAGS += -Wall -g
+CXXFLAGS += -Wall -s
 
 
-# General optimization flags.  Note that -O2 might be faster than -O3 on some
+# General optimization flags. Note that -O2 might be faster than -O3 on some
 # systems; this requires testing.
 
-CXXFLAGS += -O3 -fno-exceptions -fomit-frame-pointer -fno-rtti -fno-strict-aliasing
+CXXFLAGS += -O3 -fno-exceptions -fno-rtti -fno-strict-aliasing
 
 # Disable most annoying warnings for the Intel C++ compiler
 
-CXXFLAGS += -wd383,869,981
+# CXXFLAGS += -wd383,869,981
 
 
 # Compiler optimization flags for the Intel C++ compiler in Mac OS X: