<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36b41c40905740601b7fbedac648e221b453fc44">https://github.com/macports/macports-ports/commit/36b41c40905740601b7fbedac648e221b453fc44</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 36b41c4 gcc9: update to 9.3.0
</span>36b41c4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 36b41c40905740601b7fbedac648e221b453fc44
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Mar 12 17:49:13 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> gcc9: update to 9.3.0
</span>---
lang/gcc9/Portfile | 26 +---
.../files/darwin19-OSX_AVAILABLE_STARTING.patch | 139 ---------------------
lang/gcc9/files/use-SDKROOT.patch | 75 -----------
3 files changed, 6 insertions(+), 234 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8731712..0b74a49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +9,9 @@ PortGroup xcode_workaround 1.0
</span>
epoch 2
name gcc9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc9 { revision 1 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc9 { revision 0 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,9 @@ master_sites ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/re
</span> distname gcc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a51d7f812f45980c517c4505e04a217cf319a992 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 70607648
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e0ade31726b8fbb1eb308e2b1383a79633aef996 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 70533868
</span>
depends_lib port:cctools \
port:gmp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,20 +58,6 @@ platform darwin {
</span> configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for Darwin19/Xcode11 issue, borrowed from Homebrew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# For simplicitly, just apply to both Darwin 18 and 19 (as both could have Xcode11).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/Homebrew/homebrew-core/blob/master/Formula/gcc.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed and hopefully removed when fixed either upstream by gcc or by Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 18 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append darwin19-OSX_AVAILABLE_STARTING.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Support Xcode SDKROOT / xcrun.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Based on master branch patch discussed in :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00251.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append use-SDKROOT.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.dir ${workpath}/build
configure.cmd ${worksrcpath}/configure
configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/files/darwin19-OSX_AVAILABLE_STARTING.patch b/lang/gcc9/files/darwin19-OSX_AVAILABLE_STARTING.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a503ebc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/files/darwin19-OSX_AVAILABLE_STARTING.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,139 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -pur gcc-9.2.0/fixincludes/fixincl.x gcc-9.2.0-fixed/fixincludes/fixincl.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fixincludes/fixincl.x.orig 2019-08-03 21:21:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fixincludes/fixincl.x 2019-10-01 11:43:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * DO NOT EDIT THIS FILE (fixincl.x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * It has been AutoGen-ed July 7, 2019 at 11:43:37 AM by AutoGen 5.17.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * It has been AutoGen-ed October 1, 2019 at 11:43:32 AM by AutoGen 5.18.16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * From the definitions inclhack.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * and the template file fixincl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Jul 7 11:43:37 BST 2019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Oct 1 11:43:32 CEST 2019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * You must regenerate it. Use the ./genfixes script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * certain ANSI-incompatible system header files which are fixed to work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * correctly with ANSI C and placed in a directory that GNU C will search.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * This file contains 255 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This file contains 256 fixup descriptions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * See README for more information.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2636,6 +2636,48 @@ static const char* apzDarwin_Availabilit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* * * * * * * * * * * * * * * * * * * * * * * * * *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Description of Darwin_Availability fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC zDarwin_AvailabilityName[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "darwin_availability";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * File name selection pattern
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC zDarwin_AvailabilityList[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "Availability.h\0";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Machine/OS name selection pattern
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC* apzDarwin_AvailabilityMachs[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "*-*-darwin*",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (const char*)NULL };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * content selection pattern - do fix if pattern found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tSCC zDarwin_AvailabilitySelect0[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "#endif /\\* __OSX_AVAILABLE_STARTING \\*/";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define DARWIN_AVAILABILITY_TEST_CT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static tTestDesc aDarwin_AvailabilityTests[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { TT_EGREP, zDarwin_AvailabilitySelect0, (regex_t*)NULL }, };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Fix Command Arguments for Darwin_Availability
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const char* apzDarwin_AvailabilityPatch[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "format",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "#endif /* __OSX_AVAILABLE_STARTING */\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __OSX_AVAILABLE_STARTING\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define __OSX_AVAILABLE_STARTING(_osx, _ios)\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep)\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg)\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (char*)NULL };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Description of Darwin_9_Long_Double_Funcs_2 fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tSCC zDarwin_9_Long_Double_Funcs_2Name[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10346,9 +10388,9 @@ static const char* apzX11_SprintfPatch[]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * List of all fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define REGEX_COUNT 293
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define REGEX_COUNT 294
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define MACH_LIST_SIZE_LIMIT 187
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FIX_COUNT 255
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FIX_COUNT 256
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Enumerate the fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10416,6 +10458,7 @@ typedef enum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CTRL_QUOTES_USE_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX_UNREADY_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_AVAILABILITYINTERNAL_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DARWIN_AVAILABILITY_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_EXTERNC_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_GCC4_BREAKAGE_FIXIDX,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10922,6 +10965,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aDarwin_AvailabilityinternalTests, apzDarwin_AvailabilityinternalPatch, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { zDarwin_AvailabilityName, zDarwin_AvailabilityList,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ apzDarwin_AvailabilityMachs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DARWIN_AVAILABILITY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ aDarwin_AvailabilityTests, apzDarwin_AvailabilityPatch, 0 },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { zDarwin_9_Long_Double_Funcs_2Name, zDarwin_9_Long_Double_Funcs_2List,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apzDarwin_9_Long_Double_Funcs_2Machs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -pur gcc-9.2.0/fixincludes/inclhack.def gcc-9.2.0-fixed/fixincludes/inclhack.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fixincludes/inclhack.def.orig 2019-08-03 21:21:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fixincludes/inclhack.def 2019-10-01 11:43:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1298,6 +1298,28 @@ fix = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * macOS 10.15 <Availability.h> does not define __OSX_AVAILABLE_STARTING on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * non-clang compilers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fix = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hackname = darwin_availability;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mach = "*-*-darwin*";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ files = Availability.h;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ select = "#endif /\\* __OSX_AVAILABLE_STARTING \\*/";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c_fix = format;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c_fix_arg = <<- _EOFix_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif /* __OSX_AVAILABLE_STARTING */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #ifndef __OSX_AVAILABLE_STARTING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define __OSX_AVAILABLE_STARTING(_osx, _ios)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _EOFix_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test_text = "#endif /* __OSX_AVAILABLE_STARTING */";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * For the AAB_darwin7_9_long_double_funcs fix (and later fixes for long long)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to be useful, the main math.h must use <> and not "" includes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/files/use-SDKROOT.patch b/lang/gcc9/files/use-SDKROOT.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 228dd83..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/files/use-SDKROOT.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin-driver.c.orig 2019-10-13 15:43:49.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/config/darwin-driver.c 2019-10-13 15:49:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,6 +210,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return new_flag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* See if we can find the sysroot from the SDKROOT environment variable. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+maybe_get_sysroot_from_sdkroot ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *maybe_sysroot = getenv ("SDKROOT");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* We'll use the same rules as the clang driver, for compatibility.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 1) The path must be absolute
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 2) Ignore "/", that is the default anyway and we do not want the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysroot semantics to be applied to it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 3) It must exist (actually, we'll check it's readable too). */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (maybe_sysroot == NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || *maybe_sysroot != '/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || strlen (maybe_sysroot) == 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || access (maybe_sysroot, R_OK) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return xstrndup (maybe_sysroot, strlen (maybe_sysroot));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Translate -filelist and -framework options in *DECODED_OPTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (size *DECODED_OPTIONS_COUNT) to use -Xlinker so that they are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- considered to be linker inputs in the case that no other inputs are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,7 +255,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool appendM64 = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *vers_string = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool seen_version_min = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool seen_sysroot_p = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 1; i < *decoded_options_count; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((*decoded_options)[i].errors & CL_ERR_MISSING_ARG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,6 +336,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --*decoded_options_count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case OPT__sysroot_:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case OPT_isysroot:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ seen_sysroot_p = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -375,6 +402,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &(*decoded_options)[*decoded_options_count - 1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! seen_sysroot_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* We will pick up an SDKROOT if we didn't specify a sysroot and treat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ it as overriding any configure-time --with-sysroot. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *sdkroot = maybe_get_sysroot_from_sdkroot ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sdkroot)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ++*decoded_options_count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *decoded_options = XRESIZEVEC (struct cl_decoded_option,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *decoded_options,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *decoded_options_count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ generate_option (OPT__sysroot_, sdkroot, 1, CL_DRIVER,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &(*decoded_options)[*decoded_options_count - 1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We will need to know the OS X version we're trying to build for here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- so that we can figure out the mechanism and source for the sysroot to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- be used. */
</span></pre><pre style='margin:0'>
</pre>