Nexus/nexus
Nexus/nexus
Watch
4
5
Fork
You've already forked nexus
 6
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity

Consolidate getXCodeSDK/getXCodeClang into a single getXCodeTool

Browse source
This commit is contained in:
Erwan Leboucher 2026-08-08 22:30:48 +02:00
commit 85ce14f193
Signed by: eleboucher
SSH key fingerprint: SHA256:fjyYE6Mo6r2wpEtyYKFfGpX8fmR9bjL0NxWBHosnOgk
2 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hook/build.dart
View file

@ -28,7 +28,7 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
final iosConfig = codeConfig.iOS; final iosConfig = codeConfig.iOS;
iosSdk = iosConfig.targetSdk; iosSdk = iosConfig.targetSdk;
final minVersion = iosConfig.targetVersion; final minVersion = iosConfig.targetVersion;
iosSdkPath = await getXCodeSDK(sdkType: iosSdk.type); iosSdkPath = await getXCodeTool(sdkType: iosSdk.type);
final archTriple = switch (targetArch) { final archTriple = switch (targetArch) {
Architecture.arm64 => "arm64", Architecture.arm64 => "arm64",
Architecture.x64 => "x86_64", Architecture.x64 => "x86_64",
@ -41,14 +41,14 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
: "$archTriple-apple-ios$minVersion.0"; : "$archTriple-apple-ios$minVersion.0";
extraEnv = { extraEnv = {
"GOOS": "ios", "GOOS": "ios",
"CC": await getXCodeClang(sdkType: iosSdk.type), "CC": await getXCodeTool(sdkType: iosSdk.type, findTool: "clang"),
"CGO_CFLAGS": "-isysroot $iosSdkPath -target $iosTargetTriple", "CGO_CFLAGS": "-isysroot $iosSdkPath -target $iosTargetTriple",
"CGO_LDFLAGS": "-isysroot $iosSdkPath -target $iosTargetTriple", "CGO_LDFLAGS": "-isysroot $iosSdkPath -target $iosTargetTriple",
}; };
break; break;
case OS.macOS: case OS.macOS:
libFileName = "libgomuks.dylib"; libFileName = "libgomuks.dylib";
extraEnv = {"SDKROOT": await getXCodeSDK()}; extraEnv = {"SDKROOT": await getXCodeTool()};
break; break;
case OS.windows: case OS.windows:
libFileName = "libgomuks.dll"; libFileName = "libgomuks.dll";

20
lib/helpers/extensions/get_xcode_sdk.dart
View file

@ -1,22 +1,14 @@
import "dart:io"; import "dart:io";
Future<String> _runXcrun(List<String> args, String errorContext) async { Future<String> getXCodeTool({String? sdkType, String? findTool}) async {
final result = await Process.run("xcrun", args); final result = await Process.run("xcrun", [
if (sdkType != null) ...["--sdk", sdkType],
if (findTool != null) ...["-f", findTool] else "--show-sdk-path",
]);
if (result.exitCode != 0) { if (result.exitCode != 0) {
throw Exception("Failed to $errorContext\n${result.stderr}"); throw Exception("Failed to run xcrun\n${result.stderr}");
} }
return result.stdout.toString().trim(); return result.stdout.toString().trim();
} }
Future<String> getXCodeSDK({String? sdkType}) => _runXcrun([
if (sdkType != null) ...["--sdk", sdkType],
"--show-sdk-path",
], "get XCode SDK");
Future<String> getXCodeClang({String? sdkType}) => _runXcrun([
if (sdkType != null) ...["--sdk", sdkType],
"-f",
"clang",
], "get XCode clang");