Skip to content

chore: enable ios targets #146

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

Merged
dpc merged 5 commits into from
Mar 19, 2024
Merged

chore: enable ios targets #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f13b430
fix: mkStdToolchains to accept any args
dpc Mar 5, 2024
e6573b6
chore: enable ios targets
dpc Mar 5, 2024
9ae473c
chore: use clang as ld
dpc Mar 5, 2024
120a564
fix: add clang default to mkIOSTarget
dpc Mar 19, 2024
60c64f4
fix: mkIOSTarget args handling
dpc Mar 19, 2024
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
2 changes: 1 addition & 1 deletion lib/mkClangTarget.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let
"CC_${target_underscores}" = "${clang}/bin/${binPrefix}clang";
"CXX_${target_underscores}" = "${clang}/bin/${binPrefix}clang++";
"AR_${target_underscores}" = "${clang}/bin/${binPrefix}ar";
"LD_${target_underscores}" = "${clang}/bin/${binPrefix}ld";
"LD_${target_underscores}" = "${clang}/bin/${binPrefix}clang";
"CARGO_TARGET_${target_underscores_upper}_LINKER" = "${clang}/bin/${binPrefix}clang";
"CARGO_TARGET_${target_underscores_upper}_RUSTFLAGS" = "-C link-arg=-fuse-ld=${clang}/bin/${binPrefix}ld -C link-arg=-Wl,--compress-debug-sections=zlib ${extraRustFlags}";

Expand Down
13 changes: 6 additions & 7 deletions lib/mkIOSTarget.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
, mergeArgs
}:
{ target
, clang
, clang ? pkgs.llvmPackages_16.clang
, llvmConfigPkg ? clang
, clang-unwrapped ? pkgs.llvmPackages_16.clang-unwrapped
, binPrefix ? ""
, buildInputs ? [ ]
, nativeBuildInputs ? [ ]
, llvmConfigPkg ? clang
, args ? { }
, ...
}@mkClangTargetArgs:
Expand All @@ -33,8 +34,9 @@ let
fi
exec llvm-config "$@"
'';
target_underscores = lib.strings.replaceStrings [ "-" ] [ "_" ] target;
target_underscores_upper = lib.strings.toUpper target_underscores;
combinedArgs = mergeArgs

{
# For older bindgen, through universal-llvm-config
"LLVM_CONFIG_PATH_${target_underscores}" = "${target-llvm-config-wrapper}/bin/llvm-config";
Expand All @@ -49,10 +51,7 @@ let

nativeBuildInputs = [ target-clang-wrapper ];
}

mkClangTargetArgs.args;
target_underscores = lib.strings.replaceStrings [ "-" ] [ "_" ] target;
target_underscores_upper = lib.strings.toUpper target_underscores;
(mkClangTargetArgs.args or { });
in
mkTarget
{
Expand Down
4 changes: 2 additions & 2 deletions lib/mkNativeTarget.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ let
"CC_${target_underscores}" = "${clang}/bin/clang";
"CXX_${target_underscores}" = "${clang}/bin/clang++";
"AR_${target_underscores}" = "${clang}/bin/ar";
"LD_${target_underscores}" = "${clang}/bin/ld";
"LD_${target_underscores}" = "${clang}/bin/clang";

"CC" = "${clang}/bin/clang";
"CXX" = "${clang}/bin/clang++";
"AR" = "${clang}/bin/ar";
"LD" = "${clang}/bin/ld";
"LD" = "${clang}/bin/clang";

inherit buildInputs nativeBuildInputs;
}
Expand Down
20 changes: 10 additions & 10 deletions lib/mkStdTargets.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,14 @@
BINDGEN_EXTRA_CLANG_ARGS_x86_64_unknown_darwin_gnu = "-I ${pkgs.pkgsCross.x86_64-darwin.buildPackages.llvmPackages.clang-unwrapped.lib}/lib/clang/16/include/";
};
};

# aarch64-ios = mkIOSTarget ({
# target = "aarch64-apple-ios";
# });
# aarch64-ios-sim = mkIOSTarget ({
# target = "aarch64-apple-ios-sim";
# });
# x86_64-ios = mkIOSTarget ({
# target = "x86_64-apple-ios";
# });
} // lib.optionalAttrs (pkgs.stdenv.isDarwin) {
aarch64-ios = mkIOSTarget ({
target = "aarch64-apple-ios";
});
aarch64-ios-sim = mkIOSTarget ({
target = "aarch64-apple-ios-sim";
});
x86_64-ios = mkIOSTarget ({
target = "x86_64-apple-ios";
});
}
1 change: 1 addition & 0 deletions lib/mkStdToolchains.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
, libclang ? pkgs.llvmPackages_16.libclang.lib
, clang-unwrapped ? pkgs.llvmPackages_16.clang-unwrapped
, stdenv ? pkgs.stdenv
, ...
}@args:
let
stdTargets = mkStdTargets { };
Expand Down