aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-05 21:02:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-05 21:02:35 +0000
commit352d081266cb97fef47265fa44a00a70c2d0ce77 (patch)
tree321ec838fe98f029c2bcc0721e236f96e0d06b21
parent7dc263ddaa3bf4b0a8129282f1b6bf84a70a298e (diff)
downloadupstream-352d081266cb97fef47265fa44a00a70c2d0ce77.tar.gz
upstream-352d081266cb97fef47265fa44a00a70c2d0ce77.tar.bz2
upstream-352d081266cb97fef47265fa44a00a70c2d0ce77.zip
scons: override the platform instead of using the host one - fixes build issues on non-linux systems
SVN-Revision: 31620
-rw-r--r--include/scons.mk2
-rw-r--r--tools/scons/patches/001-platform_env.patch11
2 files changed, 13 insertions, 0 deletions
diff --git a/include/scons.mk b/include/scons.mk
index 223aedefaf..5062681d63 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 0000000000..8aab9041c7
--- /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':