summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-04-28 21:08:34 +0000
committerjperkin <jperkin@pkgsrc.org>2015-04-28 21:08:34 +0000
commit7a7ed169f40ff84a3bf2d0e686a9ab60ebbe24c2 (patch)
treec149295393d50270d56b381e2bce750614ff0b85 /mk
parent285c8ea99ee685359f3bf8b060f2c50aaed05f7d (diff)
downloadpkgsrc-7a7ed169f40ff84a3bf2d0e686a9ab60ebbe24c2.tar.gz
Ensure the wrapper directories are created before WRAPPER_TARGETS.
Diffstat (limited to 'mk')
-rw-r--r--mk/cwrappers.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/cwrappers.mk b/mk/cwrappers.mk
index 5a80afe4449..bf47e252209 100644
--- a/mk/cwrappers.mk
+++ b/mk/cwrappers.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cwrappers.mk,v 1.23 2015/04/27 19:59:07 jperkin Exp $
+# $NetBSD: cwrappers.mk,v 1.24 2015/04/28 21:08:34 jperkin Exp $
#
# This Makefile fragment implements integration of pkgtools/cwrappers.
@@ -67,7 +67,6 @@ generate-cwrappers: ${_target_}
.endfor
generate-cwrappers:
- ${RUN}${MKDIR} ${CWRAPPERS_CONFIG_DIR} ${WRAPPER_BINDIR}
.for wrappee in as cxx cc cpp f77 imake ld libtool shlibtool
${RUN}echo worklog=${WRKLOG:Q} > ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
${RUN}echo wrksrc=${WRKSRC:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
@@ -123,13 +122,16 @@ ${_COOKIE.wrapper}: real-wrapper
.endif
.PHONY: real-wrapper
-real-wrapper: wrapper-message wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie error-check
+real-wrapper: wrapper-message wrapper-dirs wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie error-check
.PHONY: wrapper-message
-
wrapper-message:
@${PHASE_MSG} "Creating toolchain wrappers for ${PKGNAME}"
+.PHONY: wrapper-dirs
+wrapper-dirs:
+ ${RUN}${MKDIR} ${CWRAPPERS_CONFIG_DIR} ${WRAPPER_BINDIR}
+
.PHONY: pre-wrapper do-wrapper post-wrapper
do-wrapper: generate-cwrappers