mirror of
https://github.com/NixOS/nix
synced 2025-07-08 02:43:54 +02:00
Merge remote-tracking branch 'upstream/master' into package-nix
This commit is contained in:
commit
2220a4a22c
153 changed files with 2676 additions and 1547 deletions
2
Makefile
2
Makefile
|
@ -64,4 +64,4 @@ $(eval $(call include-sub-makefile, doc/manual/local.mk))
|
|||
endif
|
||||
$(eval $(call include-sub-makefile, doc/internal-api/local.mk))
|
||||
|
||||
GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++2a -I src
|
||||
GLOBAL_CXXFLAGS += -g -Wall -include $(buildprefix)config.h -std=c++2a -I src
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue