Skip to content

Commit 8fe4664

Browse files
authored
[native_toolchain_c] fix unportable link arg (dart-lang#3005)
1 parent 8454e25 commit 8fe4664

5 files changed

Lines changed: 86 additions & 12 deletions

File tree

‎.github/workflows/native.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ jobs:
6969
run: sudo apt-get update && sudo apt-get install clang-15 gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-riscv64-linux-gnu
7070
if: ${{ matrix.os == 'ubuntu' }}
7171

72+
- name: Install native toolchains
73+
run: brew install lld
74+
if: ${{ matrix.os == 'macos' }}
75+
7276
- run: dart pub get
7377

7478
- name: Run pub get, analysis, formatting, generators, tests, and examples.

‎pkgs/native_toolchain_c/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- On iOS and macOS, use the `-encryptable` linker flag. This resolves an
55
[issue](https://github.com/dart-lang/native/issues/2973) with app store
66
rejections.
7+
- Fix unportable link arg when cross-compiling from MacOS.
78

89
## 0.17.4
910

‎pkgs/native_toolchain_c/lib/src/cbuilder/run_cbuilder.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class RunCBuilder {
339339
// During bundling code assets are all placed in the same directory.
340340
// Setting this rpath allows the binary to find other code assets
341341
// it is linked against.
342-
'-Wl,-rpath=\$ORIGIN',
342+
'-Wl,-rpath,\$ORIGIN',
343343
for (final directory in libraryDirectories)
344344
'-L${directory.toFilePath()}',
345345
for (final library in libraries) '-l$library',

‎pkgs/native_toolchain_c/lib/src/tool/tool_resolver.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class PathToolResolver extends ToolResolver {
8282
if (process.exitCode == 0) {
8383
final file = File(LineSplitter.split(process.stdout).first);
8484
final uri = File(await file.resolveSymbolicLinks()).uri;
85-
if (uri.pathSegments.last == 'llvm') {
85+
if (uri.pathSegments.last case 'llvm' || 'lld') {
8686
// https://github.com/dart-lang/native/issues/136
8787
return file.uri;
8888
}

‎pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_macos_host_test.dart‎

Lines changed: 79 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import 'dart:io';
1111
import 'package:code_assets/code_assets.dart';
1212
import 'package:hooks/hooks.dart';
1313
import 'package:native_toolchain_c/native_toolchain_c.dart';
14+
import 'package:native_toolchain_c/src/native_toolchain/apple_clang.dart';
15+
import 'package:native_toolchain_c/src/tool/tool_resolver.dart';
1416
import 'package:native_toolchain_c/src/utils/run_process.dart';
1517
import 'package:test/test.dart';
1618

@@ -22,27 +24,48 @@ void main() {
2224
return;
2325
}
2426

25-
const targets = [Architecture.arm64, Architecture.x64];
27+
const targets = [
28+
(OS.macOS, Architecture.arm64),
29+
(OS.macOS, Architecture.x64),
30+
(OS.linux, Architecture.arm),
31+
(OS.linux, Architecture.arm64),
32+
(OS.linux, Architecture.ia32),
33+
(OS.linux, Architecture.x64),
34+
35+
// Not supported by Apple Clang right now.
36+
// (OS.linux, Architecture.riscv32),
37+
// (OS.linux, Architecture.riscv64),
38+
];
2639

2740
// Dont include 'mach-o' or 'Mach-O', different spelling is used.
2841
const objdumpFileFormat = {
29-
Architecture.arm64: 'arm64',
30-
Architecture.x64: '64-bit x86-64',
42+
(OS.macOS, Architecture.arm64): 'arm64',
43+
(OS.macOS, Architecture.x64): '64-bit x86-64',
44+
(OS.linux, Architecture.arm): 'elf32-littlearm',
45+
(OS.linux, Architecture.arm64): 'elf64-littleaarch64',
46+
(OS.linux, Architecture.ia32): 'elf32-i386',
47+
(OS.linux, Architecture.x64): 'elf64-x86-64',
48+
49+
(OS.linux, Architecture.riscv32): 'elf32-riscv32',
50+
(OS.linux, Architecture.riscv64): 'elf64-riscv64',
3151
};
3252

3353
const optimizationLevels = OptimizationLevel.values;
3454
var selectOptimizationLevel = 0;
3555

3656
for (final language in [Language.c, Language.objectiveC]) {
3757
for (final linkMode in [DynamicLoadingBundled(), StaticLinking()]) {
38-
for (final target in targets) {
58+
for (final (os, arch) in targets) {
59+
// Don't build Objective-C targets for linux.
60+
if (language == Language.objectiveC && os == OS.linux) continue;
61+
3962
// Cycle through all optimization levels.
4063
final optimizationLevel = optimizationLevels[selectOptimizationLevel];
4164
selectOptimizationLevel =
4265
(selectOptimizationLevel + 1) % optimizationLevels.length;
4366

4467
test(
45-
'CBuilder $linkMode $language library $target $optimizationLevel',
68+
'CBuilder $linkMode $language library $os $arch $optimizationLevel',
4669
() async {
4770
final tempUri = await tempDirForTest();
4871
final tempUri2 = await tempDirForTest();
@@ -57,6 +80,16 @@ void main() {
5780
};
5881
const name = 'add';
5982

83+
// When cross-compiling from MacOS, explicitly specify apple clang.
84+
//
85+
// The default tool-finding does not support macos cross compiling
86+
// right now.
87+
var chosenCCompiler = cCompiler;
88+
if (os == OS.linux) {
89+
// still respect the CI-provided compiler
90+
chosenCCompiler ??= await resolveAppleToolchain();
91+
}
92+
6093
final buildInputBuilder = BuildInputBuilder()
6194
..setupShared(
6295
packageName: name,
@@ -67,12 +100,12 @@ void main() {
67100
..config.setupBuild(linkingEnabled: false)
68101
..addExtension(
69102
CodeAssetExtension(
70-
targetOS: OS.macOS,
71-
targetArchitecture: target,
103+
targetOS: os,
104+
targetArchitecture: arch,
72105
linkModePreference: linkMode == DynamicLoadingBundled()
73106
? LinkModePreference.dynamic
74107
: LinkModePreference.static,
75-
cCompiler: cCompiler,
108+
cCompiler: chosenCCompiler,
76109
macOS: MacOSCodeConfig(targetVersion: defaultMacOSVersion),
77110
),
78111
);
@@ -86,6 +119,27 @@ void main() {
86119
language: language,
87120
optimizationLevel: optimizationLevel,
88121
buildMode: BuildMode.release,
122+
flags: [
123+
if (os == OS.linux)
124+
switch (arch) {
125+
Architecture.arm => '--target=arm-linux-gnueabihf',
126+
Architecture.arm64 => '--target=aarch64-linux-gnu',
127+
Architecture.ia32 => '--target=i686-linux-gnu',
128+
Architecture.x64 => '--target=x86_64-linux-gnu',
129+
Architecture.riscv32 => '--target=riscv32-linux-gnu',
130+
Architecture.riscv64 => '--target=riscv64-linux-gnu',
131+
_ => throw UnsupportedError(
132+
'Unexpected linux architecture: $arch',
133+
),
134+
},
135+
// Only homebrew lld can link for linux, and we don't have a
136+
// sysroot so we can't use stdlibs / C-runtime files.
137+
if (os == OS.linux) ...[
138+
'--ld-path=ld.lld',
139+
'-nostartfiles',
140+
'-nostdlib',
141+
],
142+
],
89143
);
90144
await cbuilder.run(
91145
input: buildInput,
@@ -94,7 +148,7 @@ void main() {
94148
);
95149

96150
final libUri = buildInput.outputDirectory.resolve(
97-
OS.macOS.libraryFileName(name, linkMode),
151+
os.libraryFileName(name, linkMode),
98152
);
99153
final result = await runProcess(
100154
executable: Uri.file('objdump'),
@@ -105,7 +159,7 @@ void main() {
105159
final machine = result.stdout
106160
.split('\n')
107161
.firstWhere((e) => e.contains('file format'));
108-
expect(machine, contains(objdumpFileFormat[target]));
162+
expect(machine, contains(objdumpFileFormat[(os, arch)]));
109163
},
110164
);
111165
}
@@ -193,3 +247,18 @@ Future<Uri> buildLib(
193247
);
194248
return libUri;
195249
}
250+
251+
Future<CCompilerConfig> resolveAppleToolchain() async {
252+
// (still respect the CI provided compiler)
253+
final context = ToolResolvingContext(logger: logger);
254+
255+
final resolvedClang = await appleClang.defaultResolver!.resolve(context);
256+
final resolvedAr = await appleAr.defaultResolver!.resolve(context);
257+
final resolvedLd = await appleLd.defaultResolver!.resolve(context);
258+
259+
return CCompilerConfig(
260+
compiler: resolvedClang.first.uri,
261+
archiver: resolvedAr.first.uri,
262+
linker: resolvedLd.first.uri,
263+
);
264+
}

0 commit comments

Comments
 (0)