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

Merge "Allow darwin targets to use -framework CoreFoundation."

Browse Source 
am: 1c0ee4ab6e

Change-Id: I415f2263c2e8b1e7c39216289055dde2d0e21663
This commit is contained in:
Josh Gao
2016-09-01 21:30:23 +00:00
committed by android-build-merger
parent 2c78d4736e 1c0ee4ab6e
commit 7ae9e32ad4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/check.go
View File

@@ -91,8 +91,8 @@ func CheckBadHostLdlibs(ctx ModuleContext, prop string, flags []string) {
flag = strings.TrimSpace(flag) flag = strings.TrimSpace(flag)
// TODO: Probably should just redo this property to prefix -l in Soong // TODO: Probably should just redo this property to prefix -l in Soong
if !strings.HasPrefix(flag, "-l") { if !strings.HasPrefix(flag, "-l") && !strings.HasPrefix(flag, "-framework") {
ctx.PropertyErrorf(prop, "Invalid flag: `%s`, must start with `-l`", flag) ctx.PropertyErrorf(prop, "Invalid flag: `%s`, must start with `-l` or `-framework`", flag)
} else if !inList(flag, allowed_ldlibs) { } else if !inList(flag, allowed_ldlibs) {
ctx.PropertyErrorf(prop, "Host library `%s` not available", flag) ctx.PropertyErrorf(prop, "Host library `%s` not available", flag)
} }

4
cc/config/x86_darwin_host.go
View File

@@ -91,14 +91,14 @@ var (
"10.11", "10.11",
} }
darwinAvailableLibraries = addPrefix([]string{ darwinAvailableLibraries = append(addPrefix([]string{
"c", "c",
"dl", "dl",
"m", "m",
"ncurses", "ncurses",
"pthread", "pthread",
"z", "z",
}, "-l") }, "-l"), "-framework CoreFoundation")
) )
const ( const (