diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-04-10 15:59:55 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-04-10 15:59:55 -0230 |
| commit | dbf5106c61088bae73e455378e89a97dbb8f5f0b (patch) | |
| tree | 6d775d542d72400d47ed926a90245df936075e77 /objective-c | |
| parent | updating ice.spec (diff) | |
| download | ice-dbf5106c61088bae73e455378e89a97dbb8f5f0b.tar.bz2 ice-dbf5106c61088bae73e455378e89a97dbb8f5f0b.tar.xz ice-dbf5106c61088bae73e455378e89a97dbb8f5f0b.zip | |
Fix to allow ObjC tests to be built against bindist
Diffstat (limited to 'objective-c')
| -rw-r--r-- | objective-c/config/Make.rules | 6 | ||||
| -rw-r--r-- | objective-c/config/Make.rules.Darwin | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules index 3dc4a03e3dc..d45a43a1f13 100644 --- a/objective-c/config/Make.rules +++ b/objective-c/config/Make.rules @@ -70,7 +70,8 @@ ifdef ice_src_dist includedir = $(top_srcdir)/include else libdir = $(ice_dir)/$(libsubdir) - includedir = $(ice_dir)/include + testlibdir = $(top_srcdir)/lib + includedir = $(ice_dir)/includemak endif headerdir = $(top_srcdir)/include @@ -89,6 +90,9 @@ FLEXFLAGS = BISONFLAGS = -dvt CPPFLAGS += -I$(includedir) LDFLAGS = $(OBJCFLAGS) -L$(libdir) +ifndef ice_src_dist + LDFLAGS += -L$(testlibdir) +endif ifdef ice_src_dist ifeq ($(ice_cpp_dir), $(ice_dir)/cpp) diff --git a/objective-c/config/Make.rules.Darwin b/objective-c/config/Make.rules.Darwin index 35658cc9704..52df269c2b8 100644 --- a/objective-c/config/Make.rules.Darwin +++ b/objective-c/config/Make.rules.Darwin @@ -64,6 +64,9 @@ ifeq ($(embedded_runpath),yes) ifneq ($(RPATH_DIR),) LDEXEFLAGS = -Wl,-rpath,$(RPATH_DIR) + ifndef ice_src_dist + LDEXEFLAGS += -Wl,-rpath,@loader_path/$(testlibdir) + endif endif endif |