<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129514] trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129514">129514</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-12-14 23:54:50 -0800 (Sun, 14 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>clang-3.6: Use xcrun fallback in compiler-rt makefile</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm36fileslionxcrunfallbackpatch">trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm36fileslionxcrunfallbackpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch (129513 => 129514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch 2014-12-15 07:13:24 UTC (rev 129513)
+++ trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch 2014-12-15 07:54:50 UTC (rev 129514)
</span><span class="lines">@@ -13,3 +13,28 @@
</span><span class="cx"> if [ "$$?" != "0" ]; then result=""; fi; \
</span><span class="cx"> echo $$result)
</span><span class="cx"> ###
</span><ins>+diff --git a/tools/clang/runtime/compiler-rt/Makefile b/tools/clang/runtime/compiler-rt/Makefile
+index 95c9fb7..50f0a81 100644
+--- a/tools/clang/runtime/compiler-rt/Makefile
++++ b/tools/clang/runtime/compiler-rt/Makefile
+@@ -82,8 +82,18 @@ RuntimeLibrary.darwin.Configs := \
+ profile_osx.a \
+ ubsan_osx.a
+
+-IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
+-IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
++XCRunSdkPath = \
++ $(shell \
++ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
++ if [ "$$?" != "0" ]; then result=""; fi; \
++ echo $$result)
++
++IOS_SDK := $(call XCRunSdkPath,iphoneos)
++IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
+
+ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
+ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
</ins></span></pre>
</div>
</div>
</body>
</html>