Skip to content

Commit

Permalink
(cherry-pick): Even when building against Tcl8, PRJLIBNAME9 should no…
Browse files Browse the repository at this point in the history
…t have the "t" suffix

else it breaks pkgIndex.tcl.in in extensions that load version-specific binary
at runtime.
  • Loading branch information
jan.nijtmans committed Sep 30, 2024
1 parent 874d253 commit 4ff6d74
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions win/rules.vc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ _RULES_VC = 1
# For modifications that are not backward-compatible, you *must* change
# the major version.
RULES_VERSION_MAJOR = 1
RULES_VERSION_MINOR = 11
RULES_VERSION_MINOR = 12

# The PROJECT macro must be defined by parent makefile.
!if "$(PROJECT)" == ""
Expand Down Expand Up @@ -1294,7 +1294,8 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
# Various output paths
PRJIMPLIB = $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
PRJLIBNAME8 = $(PROJECT)$(VERSION)$(SUFX).$(EXT)
PRJLIBNAME9 = tcl9$(PROJECT)$(VERSION)$(SUFX).$(EXT)
# Even when building against Tcl 8, PRJLIBNAME9 must not have "t"
PRJLIBNAME9 = tcl9$(PROJECT)$(VERSION)$(SUFX:t=).$(EXT)
!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"
PRJLIBNAME = $(PRJLIBNAME8)
!else
Expand Down

0 comments on commit 4ff6d74

Please sign in to comment.