summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/FreezeScript/Makefile4
-rw-r--r--cpp/src/IceBox/Makefile4
-rw-r--r--cpp/src/IceGrid/Makefile4
-rw-r--r--cpp/src/IcePatch2/Makefile4
-rw-r--r--cpp/src/IceStorm/Makefile4
5 files changed, 0 insertions, 20 deletions
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index 7cf531658f5..4f04a067797 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -37,11 +37,7 @@ objs = $(COMMON_OBJS) $(TRANSFORM_OBJS) $(DUMP_OBJS)
HDIR = $(headerdir)/FreezeScript
-ifeq ($(CPP11),yes)
-RPATH_DIR = @loader_path/../../lib/c++11
-else
RPATH_DIR = @loader_path/../lib
-endif
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index 6a60d2aa9f7..094251bd208 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -36,11 +36,7 @@ OBJS = $(LIB_OBJS) \
HDIR = $(headerdir)/IceBox
SDIR = $(slicedir)/IceBox
-ifeq ($(CPP11),yes)
-RPATH_DIR = @loader_path/../../lib/c++11
-else
RPATH_DIR = @loader_path/../lib
-endif
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index e8036927a52..cf9712f56ac 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -96,11 +96,7 @@ OBJS = $(ADMIN_OBJS) \
SDIR = $(slicedir)/IceGrid
-ifeq ($(CPP11),yes)
-RPATH_DIR = @loader_path/../../lib/c++11
-else
RPATH_DIR = @loader_path/../lib
-endif
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile
index 020ded4bc38..915b880167d 100644
--- a/cpp/src/IcePatch2/Makefile
+++ b/cpp/src/IcePatch2/Makefile
@@ -26,11 +26,7 @@ OBJS = $(SOBJS) \
$(COBJS) \
$(CALCOBJS)
-ifeq ($(CPP11),yes)
-RPATH_DIR = @loader_path/../../lib/c++11
-else
RPATH_DIR = @loader_path/../lib
-endif
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 3fd0a382414..fa934fd6004 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -62,11 +62,7 @@ OBJS = $(LIB_OBJS) \
$(AOBJS) \
$(MOBJS)
-ifeq ($(CPP11),yes)
-RPATH_DIR = @loader_path/../../lib/c++11
-else
RPATH_DIR = @loader_path/../lib
-endif
SLICE2FREEZECMD = $(SLICE2FREEZE) -I../.. --ice --include-dir IceStorm $(ICECPPFLAGS)