Răsfoiți Sursa

Fix linker complaining for android .so (#247)

Fix linker complaining when compiling android shared objects
Mohamed Shazan 5 ani în urmă
părinte
comite
c545e0d4f3
1 a modificat fișierele cu 8 adăugiri și 3 ștergeri
  1. 8 3
      scripts/toolchain.lua

+ 8 - 3
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" }