Chromium Code Reviews| Index: build/install-build-deps.sh |
| diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh |
| index 0c39d8709dfe24718d869cea10c3832a9fde7983..30c9c001ee984035663cc5a15b3b339a59fed5c4 100755 |
| --- a/build/install-build-deps.sh |
| +++ b/build/install-build-deps.sh |
| @@ -115,7 +115,7 @@ dev_list="apache2.2-bin bison cdbs curl dpkg-dev elfutils devscripts fakeroot |
| # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built |
| # NaCl binaries. |
| -if file /sbin/init | grep -q 'ELF 64-bit'; then |
| +if file $(readlink -f /sbin/init) | grep -q 'ELF 64-bit'; then |
|
Primiano Tucci (use gerrit)
2015/08/17 17:45:40
Can you just do file --dereference instead?
ki.stfu
2015/08/17 18:11:01
Yes, you're right. I haven't seen this option befo
|
| dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6" |
| fi |
| @@ -230,7 +230,7 @@ fi |
| # When cross building for arm/Android 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 file /sbin/init | grep -q 'ELF 64-bit'; then |
| +if file $(readlink -f /sbin/init) | grep -q 'ELF 64-bit'; then |
| # gcc-multilib conflicts with the arm cross compiler (at least in trusty) but |
| # g++-X.Y-multilib gives us the 32-bit support that we need. Find out the |
| # appropriate value of X and Y by seeing what version the current |