From c545e0d4f3eb00ab846ee5eb1c46c51d684cf086 Mon Sep 17 00:00:00 2001
From: Mohamed Shazan <msmshazan1@gmail.com>
Date: Sat, 20 Jun 2020 20:35:00 +0530
Subject: [PATCH] Fix linker complaining for android .so (#247)

Fix linker complaining when compiling android shared objects
---
 scripts/toolchain.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 5338a0e..97f15a6 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -846,7 +846,12 @@ function toolchain(_buildDir, _libDir)
 			"-Wl,-z,relro",
 			"-Wl,-z,now",
 		}
-
+	local sonamelink
+	if _OPTIONS["with-shared-lib"] then 
+		sonamelink = ""  
+	else 
+		sonamelink = "--fix-cortex-a8" 
+	end;
 	configuration { "android-arm" }
 		targetdir (path.join(_buildDir, "android-arm/bin"))
 		objdir (path.join(_buildDir, "android-arm/obj"))
@@ -874,7 +879,7 @@ function toolchain(_buildDir, _libDir)
 			path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm/usr/lib/crtend_so.o"),
 			"-target armv7-none-linux-androideabi",
 			"-march=armv7-a",
-			"-Wl,--fix-cortex-a8",
+			"-Wl,",sonamelink
 		}
 
 	configuration { "android-arm64" }
@@ -901,7 +906,7 @@ function toolchain(_buildDir, _libDir)
 			path.join("$(ANDROID_NDK_ROOT)/platforms", androidPlatform, "arch-arm64/usr/lib/crtend_so.o"),
 			"-target aarch64-none-linux-androideabi",
 			"-march=armv8-a",
-			"-Wl,--fix-cortex-a8",
+			"-Wl,",sonamelink
 		}
 
 	configuration { "android-x86" }