diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2018-06-27 10:52:17 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2018-06-27 11:27:06 -0700 |
| commit | 204165320e467bcf1448be60adf675a46c06724c (patch) | |
| tree | 234bf7a0bd00573753e3909926459359a7f6aa39 /cc/binary.go | |
| parent | d7e5c05eac3e4c22af8190c83f3a9e2cacf385b9 (diff) | |
| download | build_soong-204165320e467bcf1448be60adf675a46c06724c.tar.gz build_soong-204165320e467bcf1448be60adf675a46c06724c.tar.bz2 build_soong-204165320e467bcf1448be60adf675a46c06724c.zip | |
Do not set entry-point for Windows
Bug: http://b/62424007
This breaks 64-bit Windows executables. Probably due to the Clang
migration, the entry-point need not be set even for 32-bit executables.
Test: 32-bit and 64-bit aapt2_tests.exe and ziparchive-tests.exe can
start. (There are some failed tests, though).
Change-Id: Id3a7d3d2802f6b671332afff4558840bdabddeb5
Diffstat (limited to 'cc/binary.go')
| -rw-r--r-- | cc/binary.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cc/binary.go b/cc/binary.go index 4a6eb931..0303d9ad 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -216,9 +216,6 @@ func (binary *binaryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags if ctx.Host() && !binary.static() { if !ctx.Config().IsEnvTrue("DISABLE_HOST_PIE") { flags.LdFlags = append(flags.LdFlags, "-pie") - if ctx.Windows() { - flags.LdFlags = append(flags.LdFlags, "-Wl,-e_mainCRTStartup") - } } } |