summaryrefslogtreecommitdiff
path: root/cpp/config/Make.rules.Linux
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-08-10 23:53:37 +0200
committerJose <jose@zeroc.com>2012-08-10 23:53:37 +0200
commit1d5c04bb8c0e786a717e36467e17f34bcc4f1d95 (patch)
treec1c91f034589260e97033131061d536ecfc2b9cb /cpp/config/Make.rules.Linux
parentICE-4702 - Poor hash algorithm (diff)
downloadice-1d5c04bb8c0e786a717e36467e17f34bcc4f1d95.tar.bz2
ice-1d5c04bb8c0e786a717e36467e17f34bcc4f1d95.tar.xz
ice-1d5c04bb8c0e786a717e36467e17f34bcc4f1d95.zip
C++11 ami lambda support
Diffstat (limited to 'cpp/config/Make.rules.Linux')
-rw-r--r--cpp/config/Make.rules.Linux12
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index f16b2ef558a..9e0128f6712 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -24,19 +24,23 @@ endif
# Default compiler is c++ (aka g++).
#
ifeq ($(CXX),)
- CXX = c++
+ CXX = g++
endif
-ifeq ($(CXX),g++)
- CXX = c++
+ifeq ($(CXX),c++)
+ CXX = g++
endif
-ifeq ($(CXX),c++)
+ifeq ($(CXX),g++)
ifneq ($(SUSE_i586),)
CXXARCHFLAGS += -march=i586
endif
+ ifeq ($(CPP11), yes)
+ CPPFLAGS += -std=c++0x
+ endif
+
ifeq ($(MACHINE),sparc64)
#
# We are an ultra, at least, and so have the atomic instructions