From bf5c5078be2bcfe890c4fa716d3ffab110c3de13 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 5 May 2012 21:02:35 +0000 Subject: [PATCH] scons: override the platform instead of using the host one - fixes build issues on non-linux systems git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31620 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/scons.mk | 2 ++ tools/scons/patches/001-platform_env.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 tools/scons/patches/001-platform_env.patch diff --git a/include/scons.mk b/include/scons.mk index 223aedefa..5062681d6 100644 --- a/include/scons.mk +++ b/include/scons.mk @@ -1,3 +1,5 @@ +export PLATFORM=posix + SCONS_VARS = \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ diff --git a/tools/scons/patches/001-platform_env.patch b/tools/scons/patches/001-platform_env.patch new file mode 100644 index 000000000..8aab9041c --- /dev/null +++ b/tools/scons/patches/001-platform_env.patch @@ -0,0 +1,11 @@ +--- a/engine/SCons/Platform/__init__.py ++++ b/engine/SCons/Platform/__init__.py +@@ -63,6 +63,8 @@ def platform_default(): + care about the machine architecture. + """ + osname = os.name ++ if 'PLATFORM' in os.environ: ++ return os.environ['PLATFORM'] + if osname == 'java': + osname = os._osType + if osname == 'posix':