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 /objective-c | |
| 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
Diffstat (limited to 'objective-c')
| -rw-r--r-- | objective-c/config/Make.xcodesdk.rules | 2 |
1 files changed, 1 insertions, 1 deletions
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) |