Skip to content

Commit ec1fc52

Browse files
committed
Squashed 'super_native_extensions/cargokit/' changes from 820b0a11..ec49f0ee
ec49f0ee fix: don't use zigbuild for building android artifacts git-subtree-dir: super_native_extensions/cargokit git-subtree-split: ec49f0ee89744a8e80ee8df764bfb1faea95319b
1 parent 4ff7798 commit ec1fc52

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

build_tool/lib/src/builder.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ class RustBuilder {
148148
'run',
149149
_toolchain,
150150
'cargo',
151-
environment.glibcVersion != null ? 'zigbuild' : 'build',
151+
(target.android == null && environment.glibcVersion != null)
152+
? 'zigbuild'
153+
: 'build',
152154
...extraArgs,
153155
'--manifest-path',
154156
manifestPath,
@@ -157,7 +159,7 @@ class RustBuilder {
157159
if (!environment.configuration.isDebug) '--release',
158160
'--target',
159161
target.rust +
160-
(environment.glibcVersion != null
162+
((target.android == null && environment.glibcVersion != null)
161163
? '.${environment.glibcVersion!}'
162164
: ""),
163165
'--target-dir',

0 commit comments

Comments
 (0)