summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-12-27 23:38:32 +0100
committerJose <jose@zeroc.com>2012-12-27 23:38:32 +0100
commit321f2aad111863985db5707b94c33115a6b00bcf (patch)
tree4245f4bd99aafbfa587e437d2ca474eed9500f51 /cpp
parentRemove unused methods which clang complains about. (diff)
downloadice-321f2aad111863985db5707b94c33115a6b00bcf.tar.bz2
ice-321f2aad111863985db5707b94c33115a6b00bcf.tar.xz
ice-321f2aad111863985db5707b94c33115a6b00bcf.zip
Fixed (ICE-5163) - Cleanup Make.rules.Darwin
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/Make.rules.Darwin14
1 files changed, 4 insertions, 10 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 7d30c7eab06..2b910881cdf 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -52,17 +52,11 @@ ifeq ($(CXX),g++)
LDPLATFORMFLAGS += -rdynamic
endif
-#
-# Needed to link IcePHP extension.
-#
-ifeq ($(ice_language), php)
- shlibldflags = ${wl}-flat_namespace ${wl}-undefined ${wl}suppress
+
+ifdef ice_src_dist
+ shlibldflags = $(CXXFLAGS) -L$(libdir)
else
- ifdef ice_src_dist
- shlibldflags = $(CXXFLAGS) -L$(libdir)
- else
- shlibldflags = $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)
- endif
+ shlibldflags = $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)
endif
mklibfilename = $(if $(2),lib$(1).$(2).dylib,lib$(1).dylib)