Skip to content

cc-wrapper: set gl_cv_clean_version_stddef=yes on cygwin #468206

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 1 commit into from
Jan 13, 2026
+4 −11
Merged

cc-wrapper: set gl_cv_clean_version_stddef=yes on cygwin #468206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 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 @@ -603,6 +603,10 @@ stdenvNoCC.mkDerivation {
if targetPlatform.isCygwin then
''
echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_bin}/lib" >> $out
# Work around build failure caused by the gnulib workaround for
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870. remove after
# gnulib is updated in core packages (e.g. iconv, gnupatch, gnugrep)
echo appendToVar configureFlags gl_cv_clean_version_stddef=yes >> $out
''
else
''
Expand Down
6 changes: 0 additions & 6 deletions pkgs/development/libraries/libidn2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ stdenv.mkDerivation rec {
buildInputs = [ libunistring ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
depsBuildBuild = [ buildPackages.stdenv.cc ];

configureFlags =
# Work around build failure caused by the gnulib workaround for
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870.
# remove after gnulib is updated
lib.optional stdenv.hostPlatform.isCygwin "gl_cv_clean_version_stddef=yes";

meta = {
homepage = "https://www.gnu.org/software/libidn/#libidn2";
description = "Free software implementation of IDNA2008 and TR46";
Expand Down
5 changes: 0 additions & 5 deletions pkgs/tools/text/gnugrep/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ stdenv.mkDerivation {
export MKDIR_P="mkdir -p"
'';

configureFlags =
# Work around build failure caused by the gnulib workaround for
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870. remove after GCC 15
lib.optional stdenv.hostPlatform.isCygwin "gl_cv_clean_version_stddef=yes";

enableParallelBuilding = true;

# Fix reference to sh in bootstrap-tools, and invoke grep via
Expand Down
Loading