Skip to content

Minimalist iOS fixes #110101

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
Ericson2314 merged 2 commits into from
Jan 20, 2021
Merged

Minimalist iOS fixes #110101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f74a08
Minimalist iOS fixes
spease Jan 20, 2021
b766673
Move disabling of gccForLibs for iOS to build-support cc-wrapper
spease Jan 20, 2021
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
1 change: 1 addition & 0 deletions pkgs/build-support/cc-wrapper/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ let
&& libcxx == null
&& !(stdenv.targetPlatform.useLLVM or false)
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
&& !(stdenv.targetPlatform.isiOS or false)
&& gccForLibs != null;

# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11624,6 +11624,7 @@ in
bingrep = callPackage ../development/tools/analysis/bingrep { };

binutils-unwrapped = callPackage ../development/tools/misc/binutils {
autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook;
Copy link
Member

@matthewbauer matthewbauer Jan 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is annoying! When do you need to build binutils-unwrapped?

Copy link
Contributor Author

@spease spease Jan 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to get built as part of the local bootstrapping procedure after you’ve fulfilled the XCode dependency by adding it to the store. If you build the hello app you get the error, it’s pretty reproducible.

Copy link
Member

@Ericson2314 Ericson2314 Jan 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matthewbauer I think for the other tools beyond the cctools ones.

# FHS sys dirs presumably only have stuff for the build platform
noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;
};
Expand Down