Skip to content

Add macOS Apple Silicon native support #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vicvalentim wants to merge 1 commit into
base: release
Choose a base branch
from
+85 −14
Open

Add macOS Apple Silicon native support #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions devolay-java/src/main/java/me/walkerknapp/devolay/Devolay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class Devolay {
String libraryExtension = devolayLibraryName.substring(devolayLibraryName.indexOf('.'));

String osDirectory = getOsDirectory();
String archDirectory = getArchDirectory();
String archDirectory = getArchDirectory(osDirectory);

if (!osDirectory.equals("android")) {
Path devolayNativesPath = extractNative("devolay-natives", libraryExtension,
Expand Down Expand Up @@ -81,11 +81,13 @@ private static String getOsDirectory() {
}
}

private static String getArchDirectory() {
private static String getArchDirectory(String osDirectory) {
final String osArchProperty = System.getProperty("os.arch").toLowerCase();
if (osArchProperty.contains("aarch64") || (osArchProperty.contains("arm") && (osArchProperty.contains("64") || osArchProperty.contains("v8")))) {
return "arm64-v8a";
} else if (osArchProperty.contains("aarch32") || (osArchProperty.contains("arm") && (osArchProperty.contains("32") || osArchProperty.contains("v7")))) {
if (osArchProperty.contains("aarch64") || osArchProperty.contains("arm64")
|| (osArchProperty.contains("arm") && (osArchProperty.contains("64") || osArchProperty.contains("v8")))) {
return osDirectory.equals("android") ? "arm64-v8a" : "aarch64";
} else if (osArchProperty.contains("aarch32")
|| (osArchProperty.contains("arm") && (osArchProperty.contains("32") || osArchProperty.contains("v7")))) {
return "armv7a";
} else if (osArchProperty.contains("64")) {
return "x86-64";
Expand Down
79 changes: 70 additions & 9 deletions devolay-natives/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,36 @@ tasks.withType(CppCompile::class).configureEach {
if (this@configureEach.name.toLowerCase().contains("windows")) {
when (toolChain) {
is VisualCpp -> listOf("/std:c++11")
is Gcc -> listOf("-lstdc++", "-std=c++11", "-static-libgcc", "-static-libstdc++")
is Clang -> listOf("-lstdc++", "-std=c++11", "-static-libstdc++")
is Gcc -> listOf(
"-lstdc++",
"-std=c++11",
"-static-libgcc",
"-static-libstdc++")
is Clang -> listOf(
"-lstdc++",
"-std=c++11",
"-static-libstdc++")
else -> listOf()
}
} else if (OperatingSystem.current().isMacOsX && this@configureEach.name.toLowerCase().contains("macos")) {
when (toolChain) {
is Gcc, is Clang -> listOf("-std=c++11")
else -> listOf()
}
} else {
when (toolChain) {
is VisualCpp -> listOf("/std:c++11")
is Gcc -> listOf("-lstdc++", "-std=c++11", "-static-libgcc", "-static-libstdc++", "-ldl")
is Clang -> listOf("-lstdc++", "-std=c++11", "-static-libstdc++", "-ldl")
is Gcc -> listOf(
"-lstdc++",
"-std=c++11",
"-static-libgcc",
"-static-libstdc++",
"-ldl")
is Clang -> listOf(
"-lstdc++",
"-std=c++11",
"-static-libstdc++",
"-ldl")
else -> listOf()
}
}
Expand All @@ -67,16 +88,55 @@ tasks.withType(CppCompile::class).configureEach {

tasks.withType(LinkSharedLibrary::class).configureEach {
linkerArgs.addAll(toolChain.map { toolChain ->
if (this@configureEach.name.toLowerCase().contains("windows")) {
val taskName = this@configureEach.name.toLowerCase()

if (taskName.contains("windows")) {
when (toolChain) {
is Gcc -> listOf("-shared", "-static-libgcc", "-static-libstdc++")
is Clang -> listOf("-shared", "-static-libstdc++")
is Gcc -> listOf(
"-shared",
"-static-libgcc",
"-static-libstdc++")
is Clang -> listOf(
"-shared",
"-static-libstdc++")
else -> listOf()
}
} else if (taskName.contains("macos")) {
if (OperatingSystem.current().isMacOsX) {
when (toolChain) {
is Gcc, is Clang -> listOf(
"-shared",
"-Wl,-install_name,@rpath/libdevolay-natives.dylib")
else -> listOf()
}
} else {
// Preserve the existing osxcross behavior on Linux.
when (toolChain) {
is Gcc -> listOf(
"-shared",
"-static-libgcc",
"-static-libstdc++",
"-ldl",
"-Wl,-install_name,@rpath/libdevolay-natives.dylib")
is Clang -> listOf(
"-shared",
"-static-libstdc++",
"-ldl",
"-Wl,-install_name,@rpath/libdevolay-natives.dylib")
else -> listOf()
}
}
} else {
when (toolChain) {
is Gcc -> listOf("-shared", "-static-libgcc", "-static-libstdc++", "-ldl")
is Clang -> listOf("-shared", "-static-libstdc++", "-ldl")
is Gcc -> listOf(
"-shared",
"-static-libgcc",
"-static-libstdc++",
"-ldl")
is Clang -> listOf(
"-shared",
"-static-libstdc++",
"-ldl")
else -> listOf()
}
}
Expand All @@ -92,6 +152,7 @@ library {
targetMachines.set(listOf(
machines.windows.x86, machines.windows.x86_64,
machines.macOS.x86_64,
machines.macOS.architecture("aarch64"),
machines.linux.x86, machines.linux.x86_64,
machines.os("android").architecture("armv7a"),
machines.os("android").architecture("arm64-v8a"),
Expand Down
8 changes: 8 additions & 0 deletions devolay-natives/gradle/toolchains.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ open class ToolchainConfiguration : RuleSource() {
}
}

// On macOS, use the locally installed Apple Clang toolchain.
if (OperatingSystem.current().isMacOsX) {
register<Clang>("appleClang") {
target("macos_x86-64")
target("macos_aarch64")
}
}

// On windows, compile using visualcpp or gcc. Unfortunately, cross compile from windows isn't really possible
if (OperatingSystem.current().isWindows) {
register<VisualCpp>("visualCpp")
Expand Down