diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-07-06 20:10:04 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-07-06 20:10:04 -0400 |
| commit | 8e531b636f919eb69d4007b35ab3a7c14b842c13 (patch) | |
| tree | e9de75ecebc300f4e0f8022a3aaad94b877d376c | |
| parent | Fixes to ice-builder-xcode-wraper (diff) | |
| download | ice-8e531b636f919eb69d4007b35ab3a7c14b842c13.tar.bz2 ice-8e531b636f919eb69d4007b35ab3a7c14b842c13.tar.xz ice-8e531b636f919eb69d4007b35ab3a7c14b842c13.zip | |
Fix for cpp xcodesdk test build failure
| -rw-r--r-- | config/Make.rules | 4 | ||||
| -rw-r--r-- | config/Make.xcodesdk.rules | 5 | ||||
| -rw-r--r-- | cpp/config/Make.xcodesdk.rules | 2 | ||||
| -rw-r--r-- | objective-c/config/Make.xcodesdk.rules | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/config/Make.rules b/config/Make.rules index 9912746c329..aba08915e77 100644 --- a/config/Make.rules +++ b/config/Make.rules @@ -96,12 +96,12 @@ include $(top_srcdir)/config/Make.project.rules include $(top_srcdir)/config/Make.tests.rules ifneq ($(ICE_BIN_DIST),) -prefix := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr)) +prefix := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local/opt/ice,/usr)) bindir = $(install_bindir) libdir = $(install_libdir) slicedir = $(install_slicedir) includedir = $(install_includedir) -sdkdir = $(or $(ICE_HOME),/usr/local/opt/ice)/sdk +sdkdir = $(install_sdkdir) else bindir = $(call mappingdir,$(or $1,$(currentdir)),bin) libdir = $(call mappingdir,$(or $1,$(currentdir)),lib) diff --git a/config/Make.xcodesdk.rules b/config/Make.xcodesdk.rules index 5f2b290e131..6097d3dbdc6 100644 --- a/config/Make.xcodesdk.rules +++ b/config/Make.xcodesdk.rules @@ -14,11 +14,6 @@ xcodesdk_objdir = static xcodesdk_cppflags = $(static_cppflags) xcodesdk_ldflags = $(static_ldflags) -ifeq ($(filter all cpp obj%c,$(ICE_BIN_DIST)),) -$(foreach d,Ice IceSSL Glacier2 IceStorm IceGrid IceDiscovery IceLocatorDiscovery IceIAP \ - IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC,$(eval $d[xcodesdk]_targetdir := $(top_srcdir))) -endif - # # $(call make-xcodesdk,$1=translator) # diff --git a/cpp/config/Make.xcodesdk.rules b/cpp/config/Make.xcodesdk.rules index 69351444523..64d59da5d59 100644 --- a/cpp/config/Make.xcodesdk.rules +++ b/cpp/config/Make.xcodesdk.rules @@ -16,7 +16,7 @@ is-iostest-program = $(and $(filter-out macosx,$2),$(filter program,$($1_ta # # Xcode configuration to build Xcode sdks for Ice. # -xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,sdk/$2.sdk/usr/lib)) +xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,$(if $(filter all cpp obj%c,$(ICE_BIN_DIST)),,../)../sdk/$2.sdk/usr/lib)) xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,../sdk/$2.sdk/usr/lib)) xcodesdk_targetrule = $(if $(is-iostest-program),iostest,$(if $(filter-out program,$($1_target)),static)) diff --git a/objective-c/config/Make.xcodesdk.rules b/objective-c/config/Make.xcodesdk.rules index 99470e7b527..74d017ab6b0 100644 --- a/objective-c/config/Make.xcodesdk.rules +++ b/objective-c/config/Make.xcodesdk.rules @@ -14,7 +14,7 @@ supported-configs += xcodesdk arc-xcodesdk # # Xcode configuration to build Xcode sdks for Ice. # -xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,sdk/$2.sdk/usr/lib) +xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,$(if $(filter all cpp obj%c,$(ICE_BIN_DIST)),,../)../sdk/$2.sdk/usr/lib) xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,../sdk/$2.sdk/usr/lib) xcodesdk_targetrule = $(if $(filter-out program,$($1_target)),static) |