diff options
| author | Yee Cheng Chin <ychin.git@gmail.com> | 2023-10-15 09:50:53 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-10-15 09:50:53 +0200 |
| commit | 5d03525cdef5db1b1cedfa26c6f8a21aaa207ec0 (patch) | |
| tree | f76d91ca56e3a8be3b215f1965a0a3521bac176d /src/Makefile | |
| parent | de3295dd0c68a8d7540a751a99ee056fd5b9a7a4 (diff) | |
patch 9.0.2028: confusing build dependenciesv9.0.2028
Problem: confusing build dependencies
Solution: clean them up, make them parallelizable
Separate vim binary and unittest dependencies, make them parallelizable
Clean up make dependencies so Vim and unit test binaries only depend on
the object files they need. This fixes an existing issue where after
running unit tests, the Vim binary would be invalidated, which results
in it having to be linked again when running script tests, even though
Vim was already previously built.
Make link.sh (script we use to link those binaries) generate namespaced
temporary files for each app to avoid them colliding with each other.
This allows `unittesttargets` to be built in parallel.
These fixes are useful when using link-time-optimization as the link
phase could now take minutes rather than a few seconds.
closes: #13344
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/Makefile b/src/Makefile index 4d0a5ebad5..c8a84065f5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2053,12 +2053,12 @@ CCC = $(CCC_NF) $(ALL_CFLAGS) # Link the target for normal use or debugging. # A shell script is used to try linking without unnecessary libraries. -$(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h - $(CCC) version.c -o objects/version.o +$(VIMTARGET): auto/config.mk $(OBJ) objects/version.o @$(BUILD_DATE_MSG) @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ -o $(VIMTARGET) $(OBJ) $(ALL_LIBS)" \ MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \ + PROG="vim" \ sh $(srcdir)/link.sh xxd/xxd$(EXEEXT): xxd/xxd.c @@ -2267,32 +2267,32 @@ testclean: # Unittests # It's build just like Vim to satisfy all dependencies. -$(JSON_TEST_TARGET): auto/config.mk objects $(JSON_TEST_OBJ) - $(CCC) version.c -o objects/version.o +$(JSON_TEST_TARGET): auto/config.mk $(JSON_TEST_OBJ) objects/version.o @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ -o $(JSON_TEST_TARGET) $(JSON_TEST_OBJ) $(ALL_LIBS)" \ MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \ + PROG="json_test" \ sh $(srcdir)/link.sh -$(KWORD_TEST_TARGET): auto/config.mk objects $(KWORD_TEST_OBJ) - $(CCC) version.c -o objects/version.o +$(KWORD_TEST_TARGET): auto/config.mk $(KWORD_TEST_OBJ) objects/version.o @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ -o $(KWORD_TEST_TARGET) $(KWORD_TEST_OBJ) $(ALL_LIBS)" \ MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \ + PROG="kword_test" \ sh $(srcdir)/link.sh -$(MEMFILE_TEST_TARGET): auto/config.mk objects $(MEMFILE_TEST_OBJ) - $(CCC) version.c -o objects/version.o +$(MEMFILE_TEST_TARGET): auto/config.mk $(MEMFILE_TEST_OBJ) objects/version.o @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ -o $(MEMFILE_TEST_TARGET) $(MEMFILE_TEST_OBJ) $(ALL_LIBS)" \ MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \ + PROG="memfile_test" \ sh $(srcdir)/link.sh -$(MESSAGE_TEST_TARGET): auto/config.mk objects $(MESSAGE_TEST_OBJ) - $(CCC) version.c -o objects/version.o +$(MESSAGE_TEST_TARGET): auto/config.mk $(MESSAGE_TEST_OBJ) objects/version.o @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \ -o $(MESSAGE_TEST_TARGET) $(MESSAGE_TEST_OBJ) $(ALL_LIBS)" \ MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \ + PROG="message_test" \ sh $(srcdir)/link.sh # install targets @@ -3503,6 +3503,9 @@ objects/usercmd.o: usercmd.c objects/userfunc.o: userfunc.c $(CCC) -o $@ userfunc.c +objects/version.o: version.c + $(CCC) -o $@ version.c + objects/vim9class.o: vim9class.c $(CCC) -o $@ vim9class.c |