StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove support for building with OSX 10.8/9 SDKs"

Browse Source
This commit is contained in:
Treehugger Robot
2016-10-28 22:50:20 +00:00
committed by Gerrit Code Review
parent d41935f34d 85e3d0110f
commit 5d5db02bf6
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/config/x86_darwin_host.go
View File

@@ -42,14 +42,14 @@ var (
"-g", // from build/core/combo/select.mk "-g", // from build/core/combo/select.mk
"-fno-strict-aliasing", // from build/core/combo/select.mk "-fno-strict-aliasing", // from build/core/combo/select.mk
"-isysroot ${macSdkRoot}", "-isysroot ${macSdkRoot}",
"-mmacosx-version-min=${macSdkVersion}", "-mmacosx-version-min=${macMinVersion}",
"-DMACOSX_DEPLOYMENT_TARGET=${macSdkVersion}", "-DMACOSX_DEPLOYMENT_TARGET=${macMinVersion}",
} }
darwinLdflags = []string{ darwinLdflags = []string{
"-isysroot ${macSdkRoot}", "-isysroot ${macSdkRoot}",
"-Wl,-syslibroot,${macSdkRoot}", "-Wl,-syslibroot,${macSdkRoot}",
"-mmacosx-version-min=${macSdkVersion}", "-mmacosx-version-min=${macMinVersion}",
} }
// Extended cflags // Extended cflags
@@ -85,11 +85,9 @@ var (
darwinX8664ClangLdflags = ClangFilterUnknownCflags(darwinX8664Ldflags) darwinX8664ClangLdflags = ClangFilterUnknownCflags(darwinX8664Ldflags)
darwinSupportedSdkVersions = []string{ darwinSupportedSdkVersions = []string{
"10.8",
"10.9",
"10.10", "10.10",
"10.11", "10.11",
"10.12", "10.12",
} }
darwinAvailableLibraries = append( darwinAvailableLibraries = append(
@@ -119,7 +117,7 @@ func init() {
pctx.VariableFunc("macSdkRoot", func(config interface{}) (string, error) { pctx.VariableFunc("macSdkRoot", func(config interface{}) (string, error) {
return xcrunSdk(config.(android.Config), "--show-sdk-path") return xcrunSdk(config.(android.Config), "--show-sdk-path")
}) })
pctx.StaticVariable("macSdkVersion", darwinSupportedSdkVersions[0]) pctx.StaticVariable("macMinVersion", "10.8")
pctx.VariableFunc("MacArPath", func(config interface{}) (string, error) { pctx.VariableFunc("MacArPath", func(config interface{}) (string, error) {
bytes, err := exec.Command("xcrun", "--find", "ar").Output() bytes, err := exec.Command("xcrun", "--find", "ar").Output()
return strings.TrimSpace(string(bytes)), err return strings.TrimSpace(string(bytes)), err