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.

60 lines
2.4 KiB

  1. From 980ef34a085f654e74c9896e8143e6f970049b6c Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <hauke@hauke-m.de>
  3. Date: Mon, 22 Jun 2015 19:39:58 +0200
  4. Subject: [PATCH 3/5] Do not set architecture specific flags
  5. Setting architecture specific flags causes problems when you want to
  6. build something which is not covered by these.
  7. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  8. ---
  9. build_common/linux/SConscript | 20 --------------------
  10. resource/csdk/connectivity/build/linux/SConscript | 20 --------------------
  11. 2 files changed, 40 deletions(-)
  12. --- a/build_common/linux/SConscript
  13. +++ b/build_common/linux/SConscript
  14. @@ -24,20 +24,3 @@ env.AppendUnique(LINKFLAGS = ['-ldl', '-
  15. # Set arch flags that match best TARGET_ARCH variable
  16. target_arch = env.get('TARGET_ARCH')
  17. -if target_arch in ['x86']:
  18. - env.AppendUnique(CCFLAGS = ['-m32'])
  19. - env.AppendUnique(LINKFLAGS = ['-m32'])
  20. -elif target_arch in ['x86_64']:
  21. - env.AppendUnique(CCFLAGS = ['-m64'])
  22. - env.AppendUnique(LINKFLAGS = ['-m64'])
  23. -elif target_arch in ['arm'] or target_arch.find('v5') > 0:
  24. - env.AppendUnique(CPPFLAGS = ['-march=armv5te'])
  25. -elif target_arch.find('v7a-hard') > 0:
  26. - env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
  27. - env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
  28. - env.AppendUnique(CCFLAGS = ['-mfloat-abi=hard'])
  29. - env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard'])
  30. -elif target_arch.find('v7a') > 0:
  31. - env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
  32. -elif target_arch.find('arm64') >= 0:
  33. - env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
  34. --- a/resource/csdk/connectivity/build/linux/SConscript
  35. +++ b/resource/csdk/connectivity/build/linux/SConscript
  36. @@ -22,20 +22,3 @@ env.AppendUnique(LINKFLAGS = ['-ldl', '-
  37. # Set arch flags
  38. target_arch = env.get('TARGET_ARCH')
  39. -if target_arch in ['x86']:
  40. - env.AppendUnique(CCFLAGS = ['-m32'])
  41. - env.AppendUnique(LINKFLAGS = ['-m32'])
  42. -elif target_arch in ['x86_64']:
  43. - env.AppendUnique(CCFLAGS = ['-m64'])
  44. - env.AppendUnique(LINKFLAGS = ['-m64'])
  45. -elif target_arch.find('v7a-hard') > 0:
  46. - env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
  47. - env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
  48. - env.AppendUnique(CCFLAGS = ['-mfloat-abi=hard'])
  49. - env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard'])
  50. -elif target_arch.find('v7a') > 0:
  51. - env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
  52. -elif target_arch.find('arm64') > 0:
  53. - env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
  54. -else:
  55. - env.AppendUnique(CPPFLAGS = ['-march=armv5te'])