Commit ecbf440a authored by brettw@chromium.org's avatar brettw@chromium.org

Make GN pass -target flags only on Android Clang

This fails on other configurations. The new behavior matches the GYP build.

R=scottmg@chromium.org
TBR=scottmg

Review URL: https://codereview.chromium.org/130923002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243930 0039d316-1c4b-4281-b951-d872f2087c98
parent 54dc02e8
...@@ -211,15 +211,17 @@ config("compiler") { ...@@ -211,15 +211,17 @@ config("compiler") {
] ]
} }
if (cpu_arch == "arm") { if (is_clang) {
cflags += [ if (cpu_arch == "arm") {
"-target arm-linux-androideabi", cflags += [
"-mllvm -arm-enable-ehabi", "-target arm-linux-androideabi",
] "-mllvm -arm-enable-ehabi",
ldflags += [ "-target arm-linux-androideabi" ] ]
} else if (cpu_arch == "x86") { ldflags += [ "-target arm-linux-androideabi" ]
cflags += [ "-target x86-linux-androideabi" ] } else if (cpu_arch == "x86") {
ldflags += [ "-target x86-linux-androideabi" ] cflags += [ "-target x86-linux-androideabi" ]
ldflags += [ "-target x86-linux-androideabi" ]
}
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment