summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorAnthony Fieroni <bvbfan@abv.bg>2016-10-06 14:51:16 +0300
committerAnthony Fieroni <bvbfan@abv.bg>2016-10-11 20:58:24 +0300
commitf87e32696de6126f05d0b839a2a3689dd16fe73f (patch)
treecde8698316b4bd79dfca467d4f879f2c983a9c4e /platform/android
parent78d97b060a6873a454e710380cb9ef1bde5e4c65 (diff)
Correct OS architecture detection
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/detect.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 49ffc86658..469f98244d 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -124,19 +124,20 @@ def configure(env):
gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/";
- if (sys.platform.find("linux")==0):
- if (platform.architecture()[0]=='64bit' or os.path.isdir(gcc_path+"linux-x86_64/bin")): # check was not working
+ if (sys.platform.startswith("linux")):
+ if (platform.machine().endswith('64')):
gcc_path=gcc_path+"/linux-x86_64/bin"
else:
gcc_path=gcc_path+"/linux-x86/bin"
- elif (sys.platform=="darwin"):
- gcc_path=gcc_path+"/darwin-x86_64/bin" #this may be wrong
+ elif (sys.platform.startswith("darwin")):
+ gcc_path=gcc_path+"/darwin-x86_64/bin"
env['SHLINKFLAGS'][1] = '-shared'
env['SHLIBSUFFIX'] = '.so'
- elif (os.name=="nt"):
- gcc_path=gcc_path+"/windows-x86_64/bin" #this may be wrong
-
-
+ elif (os.platform.startswith('win')):
+ if (platform.machine().endswith('64')):
+ gcc_path=gcc_path+"/windows-x86_64/bin"
+ else:
+ gcc_path=gcc_path+"/windows-x86/bin"
env['ENV']['PATH'] = gcc_path+":"+env['ENV']['PATH']
if env['android_arch']=='x86':