summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-05-01 11:38:15 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-05-01 11:38:15 +0200
commit94274b9ab517aac175d205636f8561ff76d45eda (patch)
treeea2c3b71032d72c6fd16581977a4186459a6c1e4
parent8259c4670771adb574f4e813d9d5862f45642268 (diff)
OSX: Fix lib suffix for Android lib (#4499)
Fixes #1452.
-rw-r--r--platform/android/detect.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 366ec6321d..7d7fd174e5 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -102,9 +102,7 @@ def configure(env):
env["x86_opt_gcc"]=True
if env['PLATFORM'] == 'win32':
- import methods
env.Tool('gcc')
- #env['SPAWN'] = methods.win32_spawn
env['SHLIBSUFFIX'] = '.so'
@@ -127,7 +125,6 @@ def configure(env):
gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/";
- import os
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
gcc_path=gcc_path+"/linux-x86_64/bin"
@@ -136,6 +133,7 @@ def configure(env):
elif (sys.platform=="darwin"):
gcc_path=gcc_path+"/darwin-x86_64/bin" #this may be wrong
env['SHLINKFLAGS'][1] = '-shared'
+ env['SHLIBSUFFIX'] = '.so'
elif (os.name=="nt"):
gcc_path=gcc_path+"/windows-x86_64/bin" #this may be wrong