Dungeon Crawl Stone Soup Tracker - DCSS
|
Viewing Issue Advanced Details |
|
ID:
|
Category:
|
Severity:
|
Reproducibility:
|
Date Submitted:
|
Last Update:
|
8422 |
Patches |
tweak |
have not tried |
2014-04-23 06:40 |
2014-09-15 16:20 |
|
Reporter:
|
floatingatoll |
Local or Remote:
|
Both |
|
Assigned To:
|
wheals |
Operating System:
|
All |
|
Priority:
|
normal |
Console or Tiles:
|
Both |
|
Status:
|
resolved |
Product Branch:
|
0.15 ancient branch |
|
Product Version:
|
0.15-a0-205-g67e6867 |
Resolution:
|
done |
|
Projection:
|
none |
|
|
|
ETA:
|
none |
Fixed in Branch:
|
0.16 ancient branch |
|
|
Summary:
|
0008422: Makefile doesn't understand Xcode developer previews |
Description:
|
When testing a new Xcode from Apple, it resides at e.g. /Applications/XcodeDP4.app.
This presents complications when the Makefile presumes /Applications/Xcode.app, rather than honoring the output from xcode-select -p.
The attached patch attempts to use xcode-select -p to find Xcode, falling back to either /Applications/Xcode.app (or /Developer, as before). |
Steps To Reproduce:
|
|
Additional Information:
|
|
System Description:
|
|
Relationships | |
Attached Files:
|
xcode-select.patch [^] (1,752 bytes) 2014-04-23 06:40 [Show Content] [Hide Content]From 82fac95deba5b9b5847bb16df96eb59badf99bdb Mon Sep 17 00:00:00 2001
From: Richard Soderberg <rsoderberg@gmail.com>
Date: Tue, 22 Apr 2014 21:25:50 -0700
Subject: [PATCH] Makefile: use xcode-select -p to find Xcode, resort to
/Application/Xcode.app
---
crawl-ref/source/Makefile | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index 687be0e..1f4ef82 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -387,11 +387,21 @@ ifndef NO_AUTO_SDK
# The SDK locations were moved in 10.8; this snippet tries to find them
# there first, then reverts to the original location.
-ifeq ($(shell test -e /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer || echo NOPE),)
-DEVELOPER_PATH := /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer
+XCODE_SDK_SUFFIX := Platforms/MacOSX.platform/Developer
+# Try to use xcode-select -p to find the current user-configured Xcode.app.
+XCODE_SELECT_PATH := $(shell xcode-select -p 2>/dev/null | sed 's/\/$$//')
+ifeq ($(shell test -e "$(XCODE_SELECT_PATH)/$(XCODE_SDK_SUFFIX)" || echo NOPE),)
+DEVELOPER_PATH := $(XCODE_SELECT_PATH)/$(XCODE_SDK_SUFFIX)
else
+# Otherwise, try /Applications/Xcode.app.
+XCODE_DEFAULT_PATH := /Applications/Xcode.app/Contents/Developer
+ifeq ($(shell test -e "$(XCODE_DEFAULT_PATH)/$(XCODE_SDK_SUFFIX)" || echo NOPE),)
+DEVELOPER_PATH := $(XCODE_DEFAULT_PATH)/$(XCODE_SDK_SUFFIX)
+else
+# If all else fails, maybe it's in /Developer.
DEVELOPER_PATH := /Developer
endif
+endif
# Find the oldest SDK available, in attempt to make this build as
# backward-compatible as we possibly can.
--
1.8.5.2 (Apple Git-48)
|
|
Issue History |
Date Modified |
Username |
Field |
Change |
2014-04-23 06:40 |
floatingatoll |
New Issue |
|
2014-04-23 06:40 |
floatingatoll |
File Added: xcode-select.patch |
|
2014-09-15 16:20 |
wheals |
Note Added: 0027268 |
|
2014-09-15 16:20 |
wheals |
Status |
new => resolved |
2014-09-15 16:20 |
wheals |
Fixed in Branch |
=> 0.16 development branch |
2014-09-15 16:20 |
wheals |
Resolution |
open => done |
2014-09-15 16:20 |
wheals |
Assigned To |
=> wheals |