summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-11-06 18:20:23 +0100
committerJose <jose@zeroc.com>2012-11-06 18:20:23 +0100
commit92c5d81c28616cc7f20244ffb05be94b24376144 (patch)
treef7ef44f111f88cf8308c811e052e7f1fa2e58bb5 /cpp
parentIceGridGUI minor fix (diff)
downloadice-92c5d81c28616cc7f20244ffb05be94b24376144.tar.bz2
ice-92c5d81c28616cc7f20244ffb05be94b24376144.tar.xz
ice-92c5d81c28616cc7f20244ffb05be94b24376144.zip
use xcrun in OS X builds
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/Make.rules.Darwin9
1 files changed, 2 insertions, 7 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 06568790ebf..b0b5809adcd 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -11,12 +11,7 @@
# This file is included by Make.rules when uname is Darwin.
#
-ifeq ($(DEVELOPER_PATH),)
- DEVELOPER_PATH = $(shell xcode-select -print-path)
-endif
-
-TOOLCHAIN_BIN_DIR = $(DEVELOPER_PATH)/Toolchains/XcodeDefault.xctoolchain/usr/bin
-CXX = $(TOOLCHAIN_BIN_DIR)/clang++
+CXX = xcrun clang++
CXXFLAGS = -Wall -D_REENTRANT
@@ -33,7 +28,7 @@ else
endif
ifeq ($(CPP11), yes)
-ifeq ($(CXX), $(TOOLCHAIN_BIN_DIR)/clang++)
+ifeq ($(CXX), xcrun clang++)
CPPFLAGS += --std=c++11
CXXFLAGS += --stdlib=libc++
CPP11LIBSUFFIX = -c++11