646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
16 lines
959 B
Diff
16 lines
959 B
Diff
diff --git a/src/Makefile b/src/Makefile
|
|
index 864f54b..fd85f76 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -2806,8 +2806,8 @@ auto/pathdef.c: Makefile auto/config.mk
|
|
-@echo '#include "vim.h"' >> $@
|
|
-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@
|
|
-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@
|
|
- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@
|
|
- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@
|
|
+ -@echo 'char_u *all_cflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@
|
|
+ -@echo 'char_u *all_lflags = (char_u *)"see nix-store --read-log $(out)";' | $(QUOTESED) >> $@
|
|
-@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
|
|
-@if test -n "$(COMPILEDBY)"; then \
|
|
echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
|