diff options
| author | Colin Cross <ccross@android.com> | 2017-04-04 12:59:48 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-04-04 15:39:04 -0700 |
| commit | 3edeee113ac2f0be96348d7f5580414ae6642616 (patch) | |
| tree | a502b1e42b7c205202ac915dcfbc2691a1357021 /cc/binary.go | |
| parent | ac01ff5447518986f778be5b5c5a7bb0bf354e9c (diff) | |
| download | build_soong-3edeee113ac2f0be96348d7f5580414ae6642616.tar.gz build_soong-3edeee113ac2f0be96348d7f5580414ae6642616.tar.bz2 build_soong-3edeee113ac2f0be96348d7f5580414ae6642616.zip | |
Add ctx.Windows()
Replace ctx.Os() == android.Windows with ctx.Windows()
Test: builds
Change-Id: I7c24c39bcf54a51ad152b21c0021e40a0c07f189
Diffstat (limited to 'cc/binary.go')
| -rw-r--r-- | cc/binary.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/binary.go b/cc/binary.go index 637f6c7a..25783113 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -204,7 +204,7 @@ func (binary *binaryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags if ctx.Host() && !binary.static() { if !ctx.AConfig().IsEnvTrue("DISABLE_HOST_PIE") { flags.LdFlags = append(flags.LdFlags, "-pie") - if ctx.Os() == android.Windows { + if ctx.Windows() { flags.LdFlags = append(flags.LdFlags, "-Wl,-e_mainCRTStartup") } } @@ -213,7 +213,7 @@ func (binary *binaryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags // MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because // all code is position independent, and then those warnings get promoted to // errors. - if ctx.Os() != android.Windows { + if !ctx.Windows() { flags.CFlags = append(flags.CFlags, "-fpie") } |