Mk/Uses/go.mk: Fix go-post-extract for legacy mode builds

USES=go may set Go version for legacy (pre-module) builds too.
freebsd · Aug 3, 2022 · b425222 · b425222
1 parent 3c8549c
commit b425222
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
@@ -190,19 +190,19 @@ go-post-fetch:
 .  endif
 
 _USES_extract+=	800:go-post-extract
-.  if empty(go_ARGS)
-# Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module.
-go-post-extract:
-	@${MKDIR} ${GO_WRKSRC:H}
-	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
-.  elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
+.  if ${go_ARGS:Mmodules} && defined(GO_MODULE)
 # Module-aware build mode. Although not strictly necessary (all build dependencies should be
 # already in MODCACHE), vendor them so we can patch them if needed.
 go-post-extract:
 	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
 	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
 	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
 	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
+.  else
+# Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module.
+go-post-extract:
+	@${MKDIR} ${GO_WRKSRC:H}
+	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
 .  endif
 
 .  if !target(do-build) && empty(go_ARGS:Mno_targets)