aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Sun <jsun@junsun.net>2019-02-12 07:03:44 +0000
committerJun Sun <jsun@junsun.net>2019-02-16 02:26:45 +0000
commitc37c696b94bd7ddecc12a2c3192f5e48eae7842e (patch)
tree719527791c3822fff752d69d90f2b8cc4ff68a43
parentb78a6aed115ad5cdd1a79ea16efbe3659d3c4549 (diff)
downloadangle-emu-29.0-release.tar.gz
Support building ANGLE on linux-aarch64 host.emu-29.0-release
We need to ignore these 2 warnings because otherwise build will fail due to "-Werror" flag. The patch is simply whitelisting aarch64 host in depo tools. Change-Id: Idebacd5721514a1ee666dfa118a12d6b779a9efe
-rw-r--r--build/common.gypi2
-rw-r--r--linux-aarch64/angle-depo_tools-ninja-aarch64.patch14
2 files changed, 16 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 836df00b30..c860a9707b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -33,6 +33,8 @@
'-Wpointer-arith',
'-Wundef',
'-Wwrite-strings',
+ '-Wno-deprecated-declarations',
+ '-Wno-implicit-fallthrough',
],
# TODO: Pull chromium's clang dep.
diff --git a/linux-aarch64/angle-depo_tools-ninja-aarch64.patch b/linux-aarch64/angle-depo_tools-ninja-aarch64.patch
new file mode 100644
index 0000000000..77750062b4
--- /dev/null
+++ b/linux-aarch64/angle-depo_tools-ninja-aarch64.patch
@@ -0,0 +1,14 @@
+On linux-aarch64, we use host native ninja for now.
+
+diff -Nru angle/depot_tools/ninja.orig angle/depot_tools/ninja
+--- angle/depot_tools/ninja.orig 2018-12-28 18:02:51.070867009 +0000
++++ angle/depot_tools/ninja 2018-12-28 18:07:56.513783181 +0000
+@@ -28,6 +28,8 @@
+ # bittage of the userspace install (e.g. when running 32-bit userspace
+ # on x86_64 kernel)
+ exec "${THIS_DIR}/ninja-linux${LONG_BIT}" "$@";;
++ aarch64)
++ exec "/usr/bin/ninja" "$@";;
+ *)
+ echo Unknown architecture \($MACHINE\) -- unable to run ninja.
+ print_help