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

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

Issue 1909713002: Updating install-build-deps.sh to fix dependency issues in wily (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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 aa0ae2360b9aa9fc87391ed62a489cb09d97e966..ea3cb961097124560270fad722ff8916a802d4b5 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -156,10 +156,17 @@ arm_list="libc6-dev-armhf-cross
g++-arm-linux-gnueabihf"
# Work around for dependency issue Ubuntu/Trusty: http://crbug.com/435056
-if [ "x$lsb_release" = "xtrusty" ]; then
- arm_list+=" g++-4.8-multilib-arm-linux-gnueabihf
- gcc-4.8-multilib-arm-linux-gnueabihf"
-fi
+case $lsb_release in
+ trusty)
+ arm_list+=" g++-4.8-multilib-arm-linux-gnueabihf
+ gcc-4.8-multilib-arm-linux-gnueabihf"
+ ;;
+ wily)
+ arm_list+=" g++-5-multilib-arm-linux-gnueabihf
+ gcc-5-multilib-arm-linux-gnueabihf
+ gcc-arm-linux-gnueabihf"
+ ;;
+esac
# Packages to build NaCl, its toolchains, and its ports.
naclports_list="ant autoconf bison cmake gawk intltool xutils-dev xsltproc"
« 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