aboutsummaryrefslogtreecommitdiffstats
path: root/cc/x86_darwin_host.go
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-03-03 17:22:39 -0800
committerDan Willemsen <dwillemsen@google.com>2016-03-03 17:22:39 -0800
commitf534a1064375782f4f09e8a9f1b848b8ac531cae (patch)
treed2de523df7e06b708f6e83b001de06529ec00c38 /cc/x86_darwin_host.go
parentbe03f346b35e1e5ce5c74f57614dc26bf5f2dc4e (diff)
downloadbuild_soong-f534a1064375782f4f09e8a9f1b848b8ac531cae.tar.gz
build_soong-f534a1064375782f4f09e8a9f1b848b8ac531cae.tar.bz2
build_soong-f534a1064375782f4f09e8a9f1b848b8ac531cae.zip
Reorder extra clang host flags
In make these clang-specific flags are marked as EXTRA and added after the common flags. This was causing differences between compiled objects in make and soong because -fstack-protector-strong was before -fstack-protector in soong instead of after. Change-Id: I59dd6dcfdaf5ec9184a09e79efe80b62cfe48dbb
Diffstat (limited to 'cc/x86_darwin_host.go')
-rw-r--r--cc/x86_darwin_host.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/x86_darwin_host.go b/cc/x86_darwin_host.go
index 1bd3dd05..7f4c4890 100644
--- a/cc/x86_darwin_host.go
+++ b/cc/x86_darwin_host.go
@@ -63,10 +63,10 @@ var (
"-Wl,-rpath,@loader_path/lib64",
}
- darwinClangCflags = append([]string{
+ darwinClangCflags = append(clangFilterUnknownCflags(darwinCflags), []string{
"-integrated-as",
"-fstack-protector-strong",
- }, clangFilterUnknownCflags(darwinCflags)...)
+ }...)
darwinClangLdflags = clangFilterUnknownCflags(darwinLdflags)