gnumake: do not use MAKE_CXX #314716

tie · 2024-05-25T23:58:49Z

Description of changes

Removes unnecessary C++ compiler reference when CXX environment variable is set to an absolute path.

See also https://savannah.gnu.org/bugs/?63668

Parent PR:

wrapCC, wrapBintools: use absolute paths #314920

Motivation

I’m trying to fix cross-compilation for platforms where C/C++ compiler’s targetPrefix is identical. It’s common to set

depsBuildBuild = [ buildPackages.stdenv.cc ];

when cross-compiling, however, cc/bintools wrapper setup hook currently sets {CC,CXX}{,_FOR_BUILD} et cetera to program name instead of absolute path. That obviously doesn’t work because only the first program from PATH is used (for example, this is part of the reason why static glibc doesn’t work in Nixpkgs and we have pkgsStatic use musl that has different target prefix). There are a lot of other things that start falling apart in stdenv when we set these variables to absolute paths, this is just one of them: gnumake is part of the stdenv and shouldn’t refer to the bootstrap tools.

Things done

Add a 👍 reaction to pull requests you find important.

tie · 2024-07-16T23:39:41Z

Yikes, gnumake doesn’t have a maintainer now (#324539) 🫠

@AndersonTorres, would you mind reviewing this PR?

AndersonTorres · 2024-07-17T01:25:55Z

Let's start with this!

#327779

AndersonTorres

I have some extra doubts about this specific project.

From a puristic perspective, it should be bootstrapped.
However, how can it be bootstrapped, given that a truckload of things that compose stdenv depend on it?

But let's postpone this. For now we need to test.

pkgs/development/tools/build-managers/gnumake/default.nix

AndersonTorres · 2024-07-17T01:53:48Z

P.S.: technically this PR should wait for next staging merge so that the meta info can be updated. But let's hope it does not conflict.

Sigmanificient · 2024-07-17T02:49:48Z

Let's start with this!

#327779

Do we have a place that list all tracking issues? I always find myself to search them which can something be tedious as i don't remember their name well

pkgs/development/tools/build-managers/gnumake/default.nix

AndersonTorres · 2024-07-17T03:47:50Z

Do we have a place that list all tracking issues? I always find myself to search them which can something be tedious as i don't remember their name well

Search for the label "scope tracking":
https://github.com/NixOS/nixpkgs/labels/5.%20scope%3A%20tracking

tie · 2024-08-17T05:24:24Z

I’ve rebased the PR and updated the change to use autoreconfHook with a patch to configure.ac and src/default.c. The only downside is that now we always need pkgconf/pkg-config to regenerate configure script (hence the updated nativeBuildInputs).

rhelmot · 2024-08-17T05:57:20Z

Isn't updateAutotoolsGnuConfigScriptsHook a subset of autoreconfHook, so you only need the latter?

pkgs/development/tools/build-managers/gnumake/default.nix

philiptaron

I built and tested the stdenv, Nix, and a few other things (gcc, clang, zig.)

LGTM.

philiptaron · 2024-08-17T15:07:32Z

I intend to merge this tomorrow; I'm holding it open for more commentary.

tie · 2024-08-17T18:20:51Z

Isn't updateAutotoolsGnuConfigScriptsHook a subset of autoreconfHook, so you only need the latter?

Uh, I’m not that familiar with Autotools and related build infrastructure in Nixpkgs. I guess this is true if autoreconfHook regenerates the files that updateAutotoolsGnuConfigScriptsHook updates 😅

I’ll remove it today when I get home if I don’t fall asleep, otherwise in the morning.

Removes unnecessary C++ compiler reference when CXX environment variable is set to an absolute path.

tie · 2024-08-18T05:45:40Z

As suggested in #314716 (comment), recreated MAKE_CXX patch with git format-patch and updated the patch set. Also removed updateAutotoolsGnuConfigScriptsHook, #314716 (comment).

tie · 2024-08-18T11:00:45Z

pkgs/development/tools/build-managers/gnumake/default.nix

+  # TODO: stdenv’s setup.sh should be aware of patch directories. It’s very
+  # convenient to keep them in a separate directory but we can defer listing the
+  # directory until derivation realization to avoid unnecessary Nix evaluations.


Created #335579

philiptaron

I'm planning on merging once a test of the stdenv completes, even though I'm not sold on the patches approach.

philiptaron · 2024-08-19T00:19:14Z

pkgs/development/tools/build-managers/gnumake/default.nix

+  # TODO: stdenv’s setup.sh should be aware of patch directories. It’s very
+  # convenient to keep them in a separate directory but we can defer listing the
+  # directory until derivation realization to avoid unnecessary Nix evaluations.
+  patches = lib.filesystem.listFilesRecursive ./patches;


As I wrote on #335579, I sort of love the old approach where the patches are just listed out. I'm willing to hear the case, but my "do the most simple thing" grugbrain triggers when there's magical patch application.

I'm willing to experiment, though.

philiptaron · 2024-08-19T00:20:04Z

pkgs/development/tools/build-managers/gnumake/patches/0002-Remove-impure-dirs.patch

+Purity: don't look for library dependencies (of the form `-lfoo') in
+/lib and /usr/lib. It's a stupid feature anyway. Likewise, when
+searching for included Makefiles, don't look in /usr/include and
+friends.


This was taken from the comment in the Nix file (and I appreciate it here!)

tie force-pushed the make-cxx branch 3 times, most recently from d24a15c to d407d58 Compare May 26, 2024 00:10

tie marked this pull request as ready for review May 26, 2024 00:13

tie requested a review from vrthra May 26, 2024 00:21

tie mentioned this pull request May 26, 2024

gawk: move gawkbug to gawkInteractive #314720

Merged

13 tasks

tie requested a review from Ericson2314 May 26, 2024 00:58

ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels May 26, 2024

tie mentioned this pull request May 28, 2024

wrapCC, wrapBintools: use absolute paths #314920

Draft

13 tasks

tie force-pushed the make-cxx branch from d407d58 to 9b1d45c Compare May 28, 2024 02:39

tie requested a review from AndersonTorres July 16, 2024 23:39

AndersonTorres suggested changes Jul 17, 2024

View reviewed changes

pkgs/development/tools/build-managers/gnumake/default.nix Outdated Show resolved Hide resolved

tie force-pushed the make-cxx branch 2 times, most recently from 239a8ed to adc412c Compare July 17, 2024 02:10

AndersonTorres reviewed Jul 17, 2024

View reviewed changes

pkgs/development/tools/build-managers/gnumake/default.nix Outdated Show resolved Hide resolved

tie force-pushed the make-cxx branch 2 times, most recently from 01ff176 to a253799 Compare July 17, 2024 04:17

tie force-pushed the make-cxx branch from a253799 to 351fbad Compare August 17, 2024 05:18

tie requested a review from philiptaron August 17, 2024 05:25

tie requested review from emilazy, SuperSandro2000, reckenrode and rhelmot August 17, 2024 05:25

AndersonTorres reviewed Aug 17, 2024

View reviewed changes

pkgs/development/tools/build-managers/gnumake/default.nix Outdated Show resolved Hide resolved

AndersonTorres approved these changes Aug 17, 2024

View reviewed changes

philiptaron approved these changes Aug 17, 2024

View reviewed changes

tie added 2 commits August 17, 2024 22:40

gnumake: do not use MAKE_CXX

3f648e2

Removes unnecessary C++ compiler reference when CXX environment variable is set to an absolute path.

gnumake: recreate patch set and move to patches directory

5fec234

tie force-pushed the make-cxx branch from 351fbad to 5fec234 Compare August 18, 2024 05:43

tie commented Aug 18, 2024

View reviewed changes

philiptaron approved these changes Aug 19, 2024

View reviewed changes

philiptaron merged commit b50a4a2 into NixOS:staging Aug 19, 2024
24 of 26 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gnumake: do not use MAKE_CXX #314716

gnumake: do not use MAKE_CXX #314716

tie commented May 25, 2024 •

edited

Loading

tie commented Jul 16, 2024

AndersonTorres commented Jul 17, 2024

AndersonTorres left a comment

AndersonTorres commented Jul 17, 2024

Sigmanificient commented Jul 17, 2024

AndersonTorres commented Jul 17, 2024

tie commented Aug 17, 2024 •

edited

Loading

rhelmot commented Aug 17, 2024

philiptaron left a comment

philiptaron commented Aug 17, 2024

tie commented Aug 17, 2024

tie commented Aug 18, 2024

tie Aug 18, 2024

philiptaron left a comment

philiptaron Aug 19, 2024

philiptaron Aug 19, 2024

gnumake: do not use MAKE_CXX #314716

gnumake: do not use MAKE_CXX #314716

Conversation

tie commented May 25, 2024 • edited Loading

Description of changes

Motivation

Things done

tie commented Jul 16, 2024

AndersonTorres commented Jul 17, 2024

AndersonTorres left a comment

Choose a reason for hiding this comment

AndersonTorres commented Jul 17, 2024

Sigmanificient commented Jul 17, 2024

AndersonTorres commented Jul 17, 2024

tie commented Aug 17, 2024 • edited Loading

rhelmot commented Aug 17, 2024

philiptaron left a comment

Choose a reason for hiding this comment

philiptaron commented Aug 17, 2024

tie commented Aug 17, 2024

tie commented Aug 18, 2024

tie Aug 18, 2024

Choose a reason for hiding this comment

philiptaron left a comment

Choose a reason for hiding this comment

philiptaron Aug 19, 2024

Choose a reason for hiding this comment

philiptaron Aug 19, 2024

Choose a reason for hiding this comment

tie commented May 25, 2024 •

edited

Loading

tie commented Aug 17, 2024 •

edited

Loading