File tree Expand file tree Collapse file tree 1 file changed +14
-7
lines changed Expand file tree Collapse file tree 1 file changed +14
-7
lines changed Original file line number Diff line number Diff line change 2
2
3
3
import argparse
4
4
import collections
5
+ import platform
5
6
import re
6
7
import os
7
8
@@ -345,7 +346,6 @@ for component_name in components:
345
346
selected_components .append (component )
346
347
todo .extend (component .dependencies )
347
348
348
-
349
349
if args .download_dependencies :
350
350
apt_get_pkgs = {
351
351
# Core requirements for this repo.
@@ -355,13 +355,20 @@ if args.download_dependencies:
355
355
'tmux' ,
356
356
'vinagre' ,
357
357
'wget' ,
358
-
359
- # Userland.
360
- 'gcc-aarch64-linux-gnu' ,
361
- 'gcc-arm-linux-gnueabihf' ,
362
- 'g++-aarch64-linux-gnu' ,
363
- 'g++-arm-linux-gnueabihf' ,
364
358
}
359
+ # E.e. on an ARM host, the package gcc-arm-linux-gnueabihf
360
+ # is called just gcc.
361
+ processor = platform .processor ()
362
+ if processor != 'arm' :
363
+ apt_get_pkgs .update ({
364
+ 'gcc-arm-linux-gnueabihf' ,
365
+ 'g++-arm-linux-gnueabihf' ,
366
+ })
367
+ if processor != 'aarch64' :
368
+ apt_get_pkgs .update ({
369
+ 'gcc-aarch64-linux-gnu' ,
370
+ 'g++-aarch64-linux-gnu' ,
371
+ })
365
372
apt_build_deps = set ()
366
373
submodules = set ()
367
374
submodules_shallow = set ()
You can’t perform that action at this time.
0 commit comments