WIP: line-for-line rewrite of build system in Meson#2613
WIP: line-for-line rewrite of build system in Meson#2613Ericson2314 wants to merge 29 commits intoNixOS:masterfrom
Conversation
|
@volth Awesome! I've just been trying to get Unix working as-is so far, but I intend to keep merging that into a windows branch (yours if you don't mind :) so we can get both working in parallel. |
The library is always used directly now
Forgot to include this when changing the AWS thing
Hopefully I can revert this someday
Finally figured that out
I was confusing `AC_SUBST` with `AC_CONFIG_HEADER`: these non-capitalized identifiers are just shell vars and should not become C preprocessor ifdefs. Also passed libstore its `-D` flags.
Each command piece can only have one @Identifier@ so need to smuggle in @output@ a different way.
It is pointless
The symlinks needs more work, however
Will test on Darwin later
|
@volth I can now at least build all the C++ |
| conf_data.set_quoted('SYSTEM', system, description : 'platform identifier (`cpu-os\')') | ||
|
|
||
| # State should be stored in /nix/var, unless the user overrides it explicitly. | ||
| if get_option('normal-var') |
There was a problem hiding this comment.
Can we determine if an option has been manually set by the user in Meson? Adding an option like this is confusing.
There was a problem hiding this comment.
It is confusing; I forget where I got stuck before. This is the autoconf original https://github.com/NixOS/nix/blob/master/configure.ac#L49-L50 . Nix hijack's the variable, in a way. I think the issue was you cannot force-set such a thing within meson.build, but you should still be able to compare the user-given value to ${prefix}/var like the autoconf. That prevents the user from forcing it to be ${prefix}/var, but hey that's no worse than today.
|
There are a few install rules missing still: |
Thanks @tetdim for finding
Ericson2314
changed the title
|
Closing because #3160 is further along |
2 participants
Includes https://github.com/NixOS/nix/pull/2612/files which includes dead code which was hard to produce.
Fixes #2503
CC @volth