diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-05 21:02:35 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-05 21:02:35 +0000 |
| commit | bf5c5078be2bcfe890c4fa716d3ffab110c3de13 (patch) | |
| tree | d054dc19b2a4030819b36e4087e30248c6e08c62 | |
| parent | 1c2f381c4a11205773b159a8ee267f85b19f5aa2 (diff) | |
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
| -rw-r--r-- | include/scons.mk | 2 | ||||
| -rw-r--r-- | tools/scons/patches/001-platform_env.patch | 11 |
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': |