Don't suggest a runtime dependency for TOOL_DEPENDS

rillig · Apr 26, 2024 · 06c4df8 · 06c4df8
1 parent 1b18c1f
commit 06c4df8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/v23/package_test.go b/v23/package_test.go
@@ -399,7 +399,7 @@ func (s *Suite) Test_Package__TOOL_DEPENDS(c *check.C) {
 
  t.CheckOutputLines(
  "WARN: Makefile:20: " +
- "Use USE_TOOLS+=perl:run instead of this dependency.")
+ "Use USE_TOOLS+=perl instead of this dependency.")
 }
 
 func (s *Suite) Test_NewPackage(c *check.C) {

diff --git a/v23/vartypecheck.go b/v23/vartypecheck.go
@@ -463,7 +463,11 @@ func (cv *VartypeCheck) DependencyWithPath() {
  case "gettext":
  cv.Warnf("Use USE_TOOLS+=msgfmt instead of this dependency.")
  case "perl5":
- cv.Warnf("Use USE_TOOLS+=perl:run instead of this dependency.")
+ if cv.Varname == "TOOL_DEPENDS" {
+ cv.Warnf("Use USE_TOOLS+=perl instead of this dependency.")
+ } else {
+ cv.Warnf("Use USE_TOOLS+=perl:run instead of this dependency.")
+ }
  case "gmake":
  cv.Warnf("Use USE_TOOLS+=gmake instead of this dependency.")
  }