You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.4 KiB

  1. From 792f68219b3ab4ff5238e3abc7aa1c68bfa4a22b Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <hauke@hauke-m.de>
  3. Date: Sat, 10 Dec 2016 18:15:32 +0100
  4. Subject: [PATCH 21/23] build: do not set TARGET_ARCH to default
  5. This check is useless, scons already checks this and returns such an
  6. error message:
  7. Invalid value for option TARGET_ARCH: mips. Valid values are: ['x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64']
  8. Change-Id: I3f7dd3b9fcae875ab20349203fb77537f24be763
  9. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  10. ---
  11. build_common/SConscript | 3 ---
  12. resource/csdk/connectivity/build/SConscript | 2 --
  13. 2 files changed, 5 deletions(-)
  14. --- a/build_common/SConscript
  15. +++ b/build_common/SConscript
  16. @@ -54,9 +54,6 @@ if target_os == 'android':
  17. else:
  18. default_arch = platform.machine()
  19. -if default_arch not in os_arch_map[target_os]:
  20. - default_arch = os_arch_map[target_os][0].lower()
  21. -
  22. target_arch = ARGUMENTS.get('TARGET_ARCH', default_arch) # target arch
  23. # True if binary needs to be installed on board. (Might need root permissions)
  24. --- a/resource/csdk/connectivity/build/SConscript
  25. +++ b/resource/csdk/connectivity/build/SConscript
  26. @@ -40,8 +40,6 @@ if target_os not in host_target_map[host
  27. Exit(1)
  28. default_arch = platform.machine()
  29. -if default_arch not in os_arch_map[target_os]:
  30. - default_arch = os_arch_map[target_os][0].lower()
  31. target_arch = ARGUMENTS.get('TARGET_ARCH', default_arch) # target arch