alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/applications/editors/vim/cflags-prune.diff

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

16 lines
959 B
Diff
Raw Normal View History

vim_configurable: misc improvements - fix wrongly used *native* build inputs; - remove confusing `prePatch = "cd src";` ; - adapt RPATH handling to multiple-output changes; - don't list full compiler flags in vim --version, as that would keep references to -dev paths. Together, the closure of the default feature-set drops almost by 100 MB. The lean vim attribute would *not* lose any references due to patching --version, so we only apply it for vim_configurable.
2016-11-07 14:45:48 +00:00
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) >> $@; \
Copy permalink