Skip to content

Feature/mingw coreutils #43710

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

Closed
angerman wants to merge 3 commits into from
Closed

Feature/mingw coreutils #43710

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38157e8
[cc-wrapper] no coreutils on with mingw
angerman Jul 15, 2018
8443878
[coreutils] assert not msvcrt.
angerman Jul 15, 2018
d9e9af2
Update default.nix
angerman Jul 18, 2018
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 pkgs/build-support/cc-wrapper/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let
libc_lib = if libc == null then null else getLib libc;
cc_solib = getLib cc;
# The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
coreutils_bin = if nativeTools then "" else getBin coreutils;
coreutils_bin = if (nativeTools || targetPlatform.isWindows) then "" else getBin coreutils;

@Ericson2314 Ericson2314 Jul 18, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I still think this one is in error? It means cc-wrapper won't use coreutils, which seems wrong.

@angerman angerman Jul 27, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No. this is right. It should not use coreutils on windows. We don't have them on windows.

@Ericson2314 Ericson2314 Jul 27, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

But that means you won't use them on Linux when you are making windows binaries. Use hostPlatform to turn it just when compiling on Windows (for any target).

@angerman angerman Jul 27, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

hmm... I'll try hostPlatform, let's see. My issue was that it tried to buld coreutils for windows when cross compiling windows stuff on linux.


default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc)
"-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
Expand Down
1 change: 1 addition & 0 deletions pkgs/tools/misc/coreutils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

assert aclSupport -> acl != null;
assert selinuxSupport -> libselinux != null && libsepol != null;
assert hostPlatform.libc != "msvcrt";

@matthewbauer matthewbauer Jul 18, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think it would make more sense to avoid the assertion and just do platforms = platforms.unix below. Assertions are annoying because there is no way to override them with something like allowUnsupportedPlatform.

@angerman angerman Jul 18, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fair point.


with lib;

Expand Down