Skip to content

Commit 0b8b449

Browse files
committed
msvc: copy the correct .pdb files in the Makefile target install
There was a hard-coded list of `.pdb` files to copy. But with the introduction of the `SKIP_DASHED_BUILT_INS` knob in the `Makefile`, this hard-coded list might very well be wrong. Let's switch to a dynamically-generated list instead. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 22764b2 commit 0b8b449

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

Makefile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2896,20 +2896,8 @@ ifdef MSVC
28962896
# have already been rolled up into the exe's pdb file.
28972897
# We DO NOT have pdb files for the builtin commands (like git-status.exe)
28982898
# because it is just a copy/hardlink of git.exe, rather than a unique binary.
2899-
$(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
2900-
$(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
2901-
$(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
2902-
$(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2903-
$(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2904-
$(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2905-
$(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2906-
$(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2907-
$(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2908-
$(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2909-
$(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2910-
$(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2911-
$(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2912-
$(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
2899+
$(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS),$(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)))) '$(DESTDIR_SQ)$(bindir_SQ)'
2900+
$(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS) $(REMOTE_CURL_ALIASES),$(PROGRAMS))) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
29132901
ifndef DEBUG
29142902
$(INSTALL) $(vcpkg_rel_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)'
29152903
$(INSTALL) $(vcpkg_rel_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'

0 commit comments

Comments
 (0)