Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2451)

Unified Diff: build/install-build-deps.sh

Issue 11568038: Add g++-multilib build dependency when cross building for ARM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/install-build-deps.sh
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index f7a9cec9cf62c34a464d4d2593540b6e7419fb8c..a7cd0e33d33306eeeffd16ffcacb4785aaf5df29 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -106,8 +106,7 @@ arm_list="libc6-armel-cross libc6-dev-armel-cross libgcc1-armel-cross
libgcc1-dbg-armel-cross libgomp1-dbg-armel-cross
binutils-arm-linux-gnueabi cpp-arm-linux-gnueabi
gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
- cpp-4.5-arm-linux-gnueabi gcc-4.5-arm-linux-gnueabi
iannucci 2012/12/17 19:52:23 Are we sure these AREN'T used? Or are these implic
- g++-4.5-arm-linux-gnueabi libmudflap0-dbg-armel-cross"
+ libmudflap0-dbg-armel-cross"
# Plugin lists needed for tests.
plugin_list="flashplugin-installer"
@@ -194,6 +193,13 @@ else
dbg_list=
fi
+# When cross building for arm on 64-bit systems the host binaries
+# that are part of v8 need to be compiled with -m32 which means
+# that basic multilib support is needed.
+if [ "$(uname -m)" = "x86_64" ]; then
+ arm_list="$arm_list g++-multilib"
+fi
+
if test "$do_inst_arm" = "1"; then
. /etc/lsb-release
if test "$DISTRIB_CODENAME" != "precise"; then
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698