diff options
author | Josh Gao <jmgao@google.com> | 2016-09-01 11:51:27 -0700 |
---|---|---|
committer | Josh Gao <jmgao@google.com> | 2016-09-01 11:53:42 -0700 |
commit | 92da2b5e99cef72fe3ec83de6f72ea73710635cf (patch) | |
tree | 1d4053835bb4b684d130d9bde8111c0a381da4af /cc | |
parent | 9d45bb78c52d160d5bf73f2a485401d394f559b9 (diff) | |
download | build_soong-92da2b5e99cef72fe3ec83de6f72ea73710635cf.tar.gz build_soong-92da2b5e99cef72fe3ec83de6f72ea73710635cf.tar.bz2 build_soong-92da2b5e99cef72fe3ec83de6f72ea73710635cf.zip |
Allow darwin targets to use -framework CoreFoundation.
Bug: http://b/31245118
Change-Id: I5aa6162715b643af4a3073e6e403a6e1729f7c15
Diffstat (limited to 'cc')
-rw-r--r-- | cc/check.go | 4 | ||||
-rw-r--r-- | cc/config/x86_darwin_host.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cc/check.go b/cc/check.go index 82d5a9ff..bb2c9dfc 100644 --- a/cc/check.go +++ b/cc/check.go @@ -91,8 +91,8 @@ func CheckBadHostLdlibs(ctx ModuleContext, prop string, flags []string) { flag = strings.TrimSpace(flag) // TODO: Probably should just redo this property to prefix -l in Soong - if !strings.HasPrefix(flag, "-l") { - ctx.PropertyErrorf(prop, "Invalid flag: `%s`, must start with `-l`", flag) + if !strings.HasPrefix(flag, "-l") && !strings.HasPrefix(flag, "-framework") { + ctx.PropertyErrorf(prop, "Invalid flag: `%s`, must start with `-l` or `-framework`", flag) } else if !inList(flag, allowed_ldlibs) { ctx.PropertyErrorf(prop, "Host library `%s` not available", flag) } diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go index e89fc9c2..1a4972eb 100644 --- a/cc/config/x86_darwin_host.go +++ b/cc/config/x86_darwin_host.go @@ -91,14 +91,14 @@ var ( "10.11", } - darwinAvailableLibraries = addPrefix([]string{ + darwinAvailableLibraries = append(addPrefix([]string{ "c", "dl", "m", "ncurses", "pthread", "z", - }, "-l") + }, "-l"), "-framework CoreFoundation") ) const ( |