* Let CC/CXX/CPP/FC always point to the compiler used in the actual
building of software. For packages that use either buildlink2 or
buildlink3, this would be the wrapper script in ${BUILDLINK_DIR}.
* Garbage-collect _BLNK_WRAP_SETENV.* as those are not needed after
the above changes. Configure and make processes will automatically
find the right compilers in the PATH.
* PKGLIBTOOL and PKGSHLIBTOOL are no longer needed since LIBTOOL and
SHLIBTOOL point to the correct libtools regardless of any
USE_BUILDLINK[23] definitions.
This commit is contained in:
jlam
parent
e412e30869
commit
3f0c4ee09a
8 changed files with 70 additions and 111 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.pkg.mk,v 1.1377 2004/02/07 02:56:14 jlam Exp $
|
||||
# $NetBSD: bsd.pkg.mk,v 1.1378 2004/02/08 02:59:14 jlam Exp $
|
||||
#
|
||||
# This file is in the public domain.
|
||||
#
|
||||
|
|
@ -367,14 +367,14 @@ LIBTOOL_REQD= ${_OPSYS_LIBTOOL_REQD}
|
|||
.else
|
||||
LIBTOOL_REQD?= 1.4.20010614nb11
|
||||
.endif
|
||||
LIBTOOL?= ${LOCALBASE}/bin/libtool
|
||||
SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool
|
||||
PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool
|
||||
PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool
|
||||
LIBTOOL?= ${PKG_LIBTOOL}
|
||||
SHLIBTOOL?= ${PKG_SHLIBTOOL}
|
||||
.if defined(USE_LIBTOOL)
|
||||
PKGLIBTOOL= ${LIBTOOL}
|
||||
PKGSHLIBTOOL= ${SHLIBTOOL}
|
||||
BUILD_DEPENDS+= libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
|
||||
CONFIGURE_ENV+= LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}"
|
||||
MAKE_ENV+= LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}"
|
||||
CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
|
||||
MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
|
||||
.endif
|
||||
|
||||
.if defined(BUILD_USES_MSGFMT) && \
|
||||
|
|
@ -2308,7 +2308,7 @@ do-ltconfig-override:
|
|||
${_PKG_SILENT}${_PKG_DEBUG} \
|
||||
if [ -f ${ltconfig} ]; then \
|
||||
${RM} -f ${ltconfig}; \
|
||||
${ECHO} "${RM} -f libtool; ${LN} -s ${PKGLIBTOOL} libtool" \
|
||||
${ECHO} "${RM} -f libtool; ${LN} -s ${LIBTOOL} libtool" \
|
||||
> ${ltconfig}; \
|
||||
${CHMOD} +x ${ltconfig}; \
|
||||
fi
|
||||
|
|
@ -2385,7 +2385,7 @@ do-libtool-override:
|
|||
${_PKG_SILENT}${_PKG_DEBUG} \
|
||||
if [ -f ${libtool} ]; then \
|
||||
(${ECHO} '#!${CONFIG_SHELL}'; \
|
||||
${ECHO} 'exec ${PKGLIBTOOL} "$$@"'; \
|
||||
${ECHO} 'exec ${LIBTOOL} "$$@"'; \
|
||||
) > ${libtool}.override; \
|
||||
if [ -x ${libtool} ]; then \
|
||||
${CHMOD} +x ${libtool}.override; \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.buildlink2.mk,v 1.112 2004/02/06 04:37:02 jlam Exp $
|
||||
# $NetBSD: bsd.buildlink2.mk,v 1.113 2004/02/08 02:59:14 jlam Exp $
|
||||
#
|
||||
# An example package buildlink2.mk file:
|
||||
#
|
||||
|
|
@ -479,10 +479,6 @@ _BLNK_WRAPPEES+= LD
|
|||
.if !empty(USE_LANGUAGES:Mfortran) || defined(USE_FORTRAN)
|
||||
_BLNK_WRAPPEES+= FC
|
||||
.endif
|
||||
.if defined(USE_LIBTOOL)
|
||||
PKGLIBTOOL= ${BUILDLINK_LIBTOOL}
|
||||
PKGSHLIBTOOL= ${BUILDLINK_SHLIBTOOL}
|
||||
.endif
|
||||
_BLNK_WRAPPEES+= LIBTOOL SHLIBTOOL
|
||||
.if defined(USE_X11)
|
||||
IMAKE?= ${X11BASE}/bin/imake
|
||||
|
|
@ -499,10 +495,6 @@ _ALIASES.LD= ld
|
|||
|
||||
# wrapper script that may be customized per wrapper:
|
||||
#
|
||||
# _BLNK_WRAP_SETENV.<wrappee> resets the value of CC, CPP, etc. in the
|
||||
# configure and make environments (CONFIGURE_ENV, MAKE_ENV) so that
|
||||
# they point to the wrappers.
|
||||
#
|
||||
# _BLNK_WRAP_{*CACHE*,*LOGIC*}.<wrappee> are parts of the wrapper script
|
||||
# system as described in pkgsrc/mk/buildlink2/README. The files not
|
||||
# ending in "-trans" represent pieces of the wrapper script that may
|
||||
|
|
@ -546,7 +538,6 @@ _BLNK_UNTRANSFORM_SEDFILE= ${BUILDLINK_DIR}/bin/.untransform.sed
|
|||
# generate the wrapper for the wrappee.
|
||||
#
|
||||
_BLNK_WRAPPER_SH.${_wrappee_}= ${.CURDIR}/../../mk/buildlink2/wrapper.sh
|
||||
_BLNK_WRAP_SETENV.${_wrappee_}= ${_wrappee_}="${BUILDLINK_${_wrappee_}:T}"
|
||||
_BLNK_WRAP_SANITIZE_PATH.${_wrappee_}= ${_BLNK_WRAP_SANITIZE_PATH}
|
||||
_BLNK_WRAP_ENV.${_wrappee_}= ${_BLNK_WRAP_ENV}
|
||||
_BLNK_WRAP_PRIVATE_PRE_CACHE.${_wrappee_}= ${_BLNK_EMPTY_FILE}
|
||||
|
|
@ -559,27 +550,12 @@ _BLNK_WRAP_LOGIC.${_wrappee_}= ${_BLNK_WRAP_LOGIC_TRANSFORM}
|
|||
_BLNK_WRAP_POST_LOGIC.${_wrappee_}= ${_BLNK_EMPTY_FILE}
|
||||
.endfor
|
||||
|
||||
# Don't bother adding AS, CPP to the configure or make environments as
|
||||
# adding them seems to break some GNU configure scripts.
|
||||
#
|
||||
_BLNK_WRAP_SETENV.AS= # empty
|
||||
_BLNK_WRAP_SETENV.CPP= # empty
|
||||
|
||||
# Also override any F77 value in the environment when compiling Fortran
|
||||
# code.
|
||||
#
|
||||
_BLNK_WRAP_SETENV.FC+= F77="${BUILDLINK_FC:T}"
|
||||
|
||||
# Don't override the default LIBTOOL and SHLIBTOOL settings in the
|
||||
# environment, as they already correctly point to the correct values, and
|
||||
# don't sanitize the PATH because we want libtool to invoke the wrapper
|
||||
# Don't sanitize the PATH because we want libtool to invoke the wrapper
|
||||
# scripts, too.
|
||||
#
|
||||
_BLNK_WRAP_SETENV.LIBTOOL= # empty
|
||||
_BLNK_WRAPPER_SH.LIBTOOL= ${.CURDIR}/../../mk/buildlink2/libtool.sh
|
||||
_BLNK_WRAP_SANITIZE_PATH.LIBTOOL= # empty
|
||||
#
|
||||
_BLNK_WRAP_SETENV.SHLIBTOOL= # empty
|
||||
_BLNK_WRAPPER_SH.SHLIBTOOL= ${.CURDIR}/../../mk/buildlink2/libtool.sh
|
||||
_BLNK_WRAP_SANITIZE_PATH.SHLIBTOOL= # empty
|
||||
|
||||
|
|
@ -605,13 +581,6 @@ _BLNK_WRAP_PRIVATE_CACHE.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_CACHE.LIBTOOL}
|
|||
_BLNK_WRAP_PRIVATE_POST_CACHE.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_POST_CACHE.LIBTOOL}
|
||||
_BLNK_WRAP_POST_LOGIC.SHLIBTOOL= ${_BLNK_WRAP_POST_LOGIC.LIBTOOL}
|
||||
|
||||
# Allow BUILDLINK_SETENV.<wrappee> to override _BLNK_WRAP_SETENV.<wrappee>.
|
||||
.for _wrappee_ in ${_BLNK_WRAPPEES}
|
||||
. if defined(BUILDLINK_SETENV.${_wrappee_})
|
||||
_BLNK_WRAP_SETENV.${_wrappee_}= ${BUILDLINK_SETENV.${_wrappee_}}
|
||||
. endif
|
||||
.endfor
|
||||
|
||||
# Don't transform the arguments for imake, which uses the C preprocessor
|
||||
# to generate Makefiles, so that imake will find its config files.
|
||||
#
|
||||
|
|
@ -626,11 +595,15 @@ buildlink-wrappers: ${_BLNK_LIBTOOL_FIX_LA}
|
|||
buildlink-wrappers: ${_BLNK_FAKE_LA}
|
||||
|
||||
.for _wrappee_ in ${_BLNK_WRAPPEES}
|
||||
CONFIGURE_ENV+= ${_BLNK_WRAP_SETENV.${_wrappee_}}
|
||||
MAKE_ENV+= ${_BLNK_WRAP_SETENV.${_wrappee_}}
|
||||
. if defined(PKG_${_wrappee_})
|
||||
_BLNK_PKG_${_wrappee_}= ${PKG_${_wrappee_}}
|
||||
. else
|
||||
_BLNK_PKG_${_wrappee_}= ${${_wrappee_}}
|
||||
. endif
|
||||
|
||||
BUILDLINK_${_wrappee_}= \
|
||||
${BUILDLINK_DIR}/bin/${${_wrappee_}:T:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
|
||||
${BUILDLINK_DIR}/bin/${_BLNK_PKG_${_wrappee_}:T:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
|
||||
${_wrappee_}:= ${BUILDLINK_${_wrappee_}:T}
|
||||
|
||||
_BLNK_WRAPPER_TRANSFORM_SED.${_wrappee_}= \
|
||||
-e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" \
|
||||
|
|
@ -670,7 +643,7 @@ ${BUILDLINK_${_wrappee_}}: \
|
|||
${_PKG_SILENT}${_PKG_DEBUG}${ECHO_BUILDLINK_MSG} \
|
||||
"Creating wrapper: ${.TARGET}"
|
||||
${_PKG_SILENT}${_PKG_DEBUG} \
|
||||
wrappee="${${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
|
||||
wrappee="${_BLNK_PKG_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
|
||||
case $${wrappee} in \
|
||||
/*) absdir=; \
|
||||
;; \
|
||||
|
|
@ -700,7 +673,7 @@ ${BUILDLINK_${_wrappee_}}: \
|
|||
${MKDIR} ${.TARGET:H}; \
|
||||
${CAT} ${_BLNK_WRAPPER_SH.${_wrappee_}} | \
|
||||
${SED} ${_BLNK_WRAPPER_TRANSFORM_SED.${_wrappee_}} \
|
||||
-e "s|@WRAPPEE@|$${absdir}${${_wrappee_}:Q}|g" \
|
||||
-e "s|@WRAPPEE@|$${absdir}${_BLNK_PKG_${_wrappee_}:Q}|g" \
|
||||
> ${.TARGET}; \
|
||||
${CHMOD} +x ${.TARGET}
|
||||
.endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.buildlink3.mk,v 1.78 2004/02/06 18:45:03 jlam Exp $
|
||||
# $NetBSD: bsd.buildlink3.mk,v 1.79 2004/02/08 02:59:14 jlam Exp $
|
||||
#
|
||||
# An example package buildlink3.mk file:
|
||||
#
|
||||
|
|
@ -954,10 +954,6 @@ _BLNK_WRAPPEES+= LD
|
|||
.if !empty(USE_LANGUAGES:Mfortran) || defined(USE_FORTRAN)
|
||||
_BLNK_WRAPPEES+= FC
|
||||
.endif
|
||||
.if defined(USE_LIBTOOL)
|
||||
PKGLIBTOOL= ${BUILDLINK_LIBTOOL}
|
||||
PKGSHLIBTOOL= ${BUILDLINK_SHLIBTOOL}
|
||||
.endif
|
||||
_BLNK_WRAPPEES+= LIBTOOL SHLIBTOOL
|
||||
.if defined(USE_X11)
|
||||
IMAKE?= ${X11BASE}/bin/imake
|
||||
|
|
@ -973,10 +969,6 @@ _ALIASES.LD= ld
|
|||
# _BLNK_WRAP_*.<wrappee> variables represent "template methods" of the
|
||||
# wrapper script that may be customized per wrapper:
|
||||
#
|
||||
# _BLNK_WRAP_SETENV.<wrappee> resets the value of CC, CPP, etc. in the
|
||||
# configure and make environments (CONFIGURE_ENV, MAKE_ENV) so that
|
||||
# they point to the wrappers.
|
||||
#
|
||||
# _BLNK_WRAP_{*CACHE*,*LOGIC*}.<wrappee> are parts of the wrapper script
|
||||
# system as described in pkgsrc/mk/buildlink3/README. The files not
|
||||
# ending in "-trans" represent pieces of the wrapper script that may
|
||||
|
|
@ -1023,7 +1015,6 @@ _BLNK_REORDERLIBS= ${BUILDLINK_DIR}/bin/.reorderlibs
|
|||
# generate the wrapper for the wrappee.
|
||||
#
|
||||
_BLNK_WRAPPER_SH.${_wrappee_}= ${.CURDIR}/../../mk/buildlink3/wrapper.sh
|
||||
_BLNK_WRAP_SETENV.${_wrappee_}= ${_wrappee_}="${BUILDLINK_${_wrappee_}:T}"
|
||||
_BLNK_WRAP_SANITIZE_PATH.${_wrappee_}= ${_BLNK_WRAP_SANITIZE_PATH}
|
||||
_BLNK_WRAP_EXTRA_FLAGS.${_wrappee_}= # empty
|
||||
_BLNK_WRAP_ENV.${_wrappee_}= ${_BLNK_WRAP_ENV}
|
||||
|
|
@ -1041,27 +1032,12 @@ _BLNK_WRAP_LOGIC.${_wrappee_}= ${_BLNK_WRAP_LOGIC_TRANSFORM}
|
|||
_BLNK_WRAP_POST_LOGIC.${_wrappee_}= ${_BLNK_EMPTY_FILE}
|
||||
.endfor
|
||||
|
||||
# Don't bother adding AS, CPP to the configure or make environments as
|
||||
# adding them seems to break some GNU configure scripts.
|
||||
#
|
||||
_BLNK_WRAP_SETENV.AS= # empty
|
||||
_BLNK_WRAP_SETENV.CPP= # empty
|
||||
|
||||
# Also override any F77 value in the environment when compiling Fortran
|
||||
# code.
|
||||
#
|
||||
_BLNK_WRAP_SETENV.FC+= F77="${BUILDLINK_FC:T}"
|
||||
|
||||
# Don't override the default LIBTOOL and SHLIBTOOL settings in the
|
||||
# environment, as they already correctly point to the correct values, and
|
||||
# don't sanitize the PATH because we want libtool to invoke the wrapper
|
||||
# Don't sanitize the PATH because we want libtool to invoke the wrapper
|
||||
# scripts, too.
|
||||
#
|
||||
_BLNK_WRAP_SETENV.LIBTOOL= # empty
|
||||
_BLNK_WRAPPER_SH.LIBTOOL= ${.CURDIR}/../../mk/buildlink3/libtool.sh
|
||||
_BLNK_WRAP_SANITIZE_PATH.LIBTOOL= # empty
|
||||
#
|
||||
_BLNK_WRAP_SETENV.SHLIBTOOL= # empty
|
||||
_BLNK_WRAPPER_SH.SHLIBTOOL= ${.CURDIR}/../../mk/buildlink3/libtool.sh
|
||||
_BLNK_WRAP_SANITIZE_PATH.SHLIBTOOL= # empty
|
||||
|
||||
|
|
@ -1121,13 +1097,6 @@ _BLNK_WRAP_PRIVATE_CACHE.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_CACHE.LIBTOOL}
|
|||
_BLNK_WRAP_PRIVATE_POST_CACHE.SHLIBTOOL= ${_BLNK_WRAP_PRIVATE_POST_CACHE.LIBTOOL}
|
||||
_BLNK_WRAP_POST_LOGIC.SHLIBTOOL= ${_BLNK_WRAP_POST_LOGIC.LIBTOOL}
|
||||
|
||||
# Allow BUILDLINK_SETENV.<wrappee> to override _BLNK_WRAP_SETENV.<wrappee>.
|
||||
.for _wrappee_ in ${_BLNK_WRAPPEES}
|
||||
. if defined(BUILDLINK_SETENV.${_wrappee_})
|
||||
_BLNK_WRAP_SETENV.${_wrappee_}= ${BUILDLINK_SETENV.${_wrappee_}}
|
||||
. endif
|
||||
.endfor
|
||||
|
||||
# Don't transform the arguments for imake, which uses the C preprocessor
|
||||
# to generate Makefiles, so that imake will find its config files.
|
||||
#
|
||||
|
|
@ -1156,11 +1125,15 @@ _BLNK_WRAP_EXTRA_FLAGS.SHLIBTOOL= ${_BLNK_WRAP_EXTRA_FLAGS.LIBTOOL}
|
|||
buildlink-wrappers: ${_BLNK_LIBTOOL_FIX_LA}
|
||||
|
||||
.for _wrappee_ in ${_BLNK_WRAPPEES}
|
||||
CONFIGURE_ENV+= ${_BLNK_WRAP_SETENV.${_wrappee_}}
|
||||
MAKE_ENV+= ${_BLNK_WRAP_SETENV.${_wrappee_}}
|
||||
. if defined(PKG_${_wrappee_})
|
||||
_BLNK_PKG_${_wrappee_}= ${PKG_${_wrappee_}}
|
||||
. else
|
||||
_BLNK_PKG_${_wrappee_}= ${${_wrappee_}}
|
||||
. endif
|
||||
|
||||
BUILDLINK_${_wrappee_}= \
|
||||
${BUILDLINK_DIR}/bin/${${_wrappee_}:T:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
|
||||
${BUILDLINK_DIR}/bin/${_BLNK_PKG_${_wrappee_}:T:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
|
||||
${_wrappee_}:= ${BUILDLINK_${_wrappee_}:T}
|
||||
|
||||
# Filter to scrunch shell scripts by removing comments and empty lines.
|
||||
_BLNK_SH_CRUNCH_FILTER= \
|
||||
|
|
@ -1214,7 +1187,7 @@ ${BUILDLINK_${_wrappee_}}: \
|
|||
${_PKG_SILENT}${_PKG_DEBUG}${ECHO_BUILDLINK_MSG} \
|
||||
"=> Creating wrapper: ${.TARGET}"
|
||||
${_PKG_SILENT}${_PKG_DEBUG} \
|
||||
wrappee="${${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
|
||||
wrappee="${_BLNK_PKG_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
|
||||
case $${wrappee} in \
|
||||
/*) absdir=; \
|
||||
;; \
|
||||
|
|
@ -1244,7 +1217,7 @@ ${BUILDLINK_${_wrappee_}}: \
|
|||
${MKDIR} ${.TARGET:H}; \
|
||||
${CAT} ${_BLNK_WRAPPER_SH.${_wrappee_}} | \
|
||||
${SED} ${_BLNK_WRAPPER_TRANSFORM_SED.${_wrappee_}} \
|
||||
-e "s|@WRAPPEE@|$${absdir}${${_wrappee_}:Q}|g" | \
|
||||
-e "s|@WRAPPEE@|$${absdir}${_BLNK_PKG_${_wrappee_}:Q}|g" | \
|
||||
${_BLNK_SH_CRUNCH_FILTER} \
|
||||
> ${.TARGET}; \
|
||||
${CHMOD} +x ${.TARGET}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: ccache.mk,v 1.11 2004/02/07 02:58:10 jlam Exp $
|
||||
# $NetBSD: ccache.mk,v 1.12 2004/02/08 02:59:14 jlam Exp $
|
||||
|
||||
.if !defined(COMPILER_CCACHE_MK)
|
||||
COMPILER_CCACHE_MK= one
|
||||
|
|
@ -38,14 +38,16 @@ _CCACHEBASE?= ${LOCALBASE}
|
|||
_CCACHE_DIR= ${WRKDIR}/.ccache
|
||||
_CCACHE_LINKS= # empty
|
||||
. if !empty(_LANGUAGES.ccache:Mc)
|
||||
_CCACHE_CC:= ${_CCACHE_DIR}/bin/${CC:T}
|
||||
_CCACHE_CC:= ${_CCACHE_DIR}/bin/${PKG_CC:T}
|
||||
_CCACHE_LINKS+= _CCACHE_CC
|
||||
CC= ${_CCACHE_CC}
|
||||
PKG_CC= ${_CCACHE_CC}
|
||||
CC= ${PKG_CC:T}
|
||||
. endif
|
||||
. if !empty(_LANGUAGES.ccache:Mc++)
|
||||
_CCACHE_CXX:= ${_CCACHE_DIR}/bin/${CXX:T}
|
||||
_CCACHE_CXX:= ${_CCACHE_DIR}/bin/${PKG_CXX:T}
|
||||
_CCACHE_LINKS+= _CCACHE_CXX
|
||||
CXX= ${_CCACHE_CXX}
|
||||
PKG_CXX= ${_CCACHE_CXX}
|
||||
CXX= ${PKG_CXX:T}
|
||||
. endif
|
||||
. endif
|
||||
. endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: distcc.mk,v 1.14 2004/02/07 02:58:10 jlam Exp $
|
||||
# $NetBSD: distcc.mk,v 1.15 2004/02/08 02:59:14 jlam Exp $
|
||||
|
||||
.if !defined(COMPILER_DISTCC_MK)
|
||||
COMPILER_DISTCC_MK= one
|
||||
|
|
@ -38,14 +38,16 @@ _DISTCCBASE?= ${LOCALBASE}
|
|||
_DISTCC_DIR= ${WRKDIR}/.distcc
|
||||
_DISTCC_LINKS= # empty
|
||||
. if !empty(_LANGUAGES.distcc:Mc)
|
||||
_DISTCC_CC:= ${_DISTCC_DIR}/bin/${CC:T}
|
||||
_DISTCC_CC:= ${_DISTCC_DIR}/bin/${PKG_CC:T}
|
||||
_DISTCC_LINKS+= _DISTCC_CC
|
||||
CC= ${_DISTCC_CC}
|
||||
PKG_CC= ${_DISTCC_CC}
|
||||
CC= ${PKG_CC:T}
|
||||
. endif
|
||||
. if !empty(_LANGUAGES.distcc:Mc++)
|
||||
_DISTCC_CXX:= ${_DISTCC_DIR}/bin/${CXX:T}
|
||||
_DISTCC_CXX:= ${_DISTCC_DIR}/bin/${PKG_CXX:T}
|
||||
_DISTCC_LINKS+= _DISTCC_CXX
|
||||
CXX= ${_DISTCC_CXX}
|
||||
PKG_CXX= ${_DISTCC_CXX}
|
||||
CXX= ${PKG_CXX:T}
|
||||
. endif
|
||||
. endif
|
||||
. endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: gcc.mk,v 1.44 2004/02/07 02:58:10 jlam Exp $
|
||||
# $NetBSD: gcc.mk,v 1.45 2004/02/08 02:59:14 jlam Exp $
|
||||
|
||||
.if !defined(COMPILER_GCC_MK)
|
||||
COMPILER_GCC_MK= one
|
||||
|
|
@ -258,23 +258,26 @@ _GCCBINDIR= ${_CC:H}
|
|||
. if exists(${_GCCBINDIR}/gcc) && !empty(_LANGUAGES.gcc:Mc)
|
||||
_GCC_CC= ${_GCC_DIR}/bin/gcc
|
||||
_GCC_LINKS+= _GCC_CC
|
||||
CC= ${_GCC_CC}
|
||||
PKG_CC= ${_GCC_CC}
|
||||
CC= ${PKG_CC:T}
|
||||
. endif
|
||||
. if exists(${_GCCBINDIR}/cpp) && !empty(_LANGUAGES.gcc:Mc)
|
||||
_GCC_CPP= ${_GCC_DIR}/bin/cpp
|
||||
_GCC_LINKS+= _GCC_CPP
|
||||
CPP= ${_GCC_CPP}
|
||||
PKG_CPP= ${_GCC_CPP}
|
||||
CPP= ${PKG_CPP:T}
|
||||
. endif
|
||||
. if exists(${_GCCBINDIR}/g++) && !empty(_LANGUAGES.gcc:Mc++)
|
||||
_GCC_CXX= ${_GCC_DIR}/bin/g++
|
||||
_GCC_LINKS+= _GCC_CXX
|
||||
CXX= ${_GCC_CXX}
|
||||
PKG_CXX= ${_GCC_CXX}
|
||||
CXX= ${PKG_CXX:T}
|
||||
. endif
|
||||
. if exists(${_GCCBINDIR}/g77) && !empty(_LANGUAGES.gcc:Mfortran)
|
||||
_GCC_F77= ${_GCC_DIR}/bin/g77
|
||||
_GCC_LINKS+= _GCC_F77
|
||||
F77= ${_GCC_F77}
|
||||
PKG_FC:= ${F77}
|
||||
_GCC_FC= ${_GCC_DIR}/bin/g77
|
||||
_GCC_LINKS+= _GCC_FC
|
||||
PKG_FC= ${_GCC_FC}
|
||||
FC= ${PKG_FC:T}
|
||||
. endif
|
||||
|
||||
# GCC passes flags to the linker using "-Wl,".
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mipspro.mk,v 1.14 2004/02/07 02:58:10 jlam Exp $
|
||||
# $NetBSD: mipspro.mk,v 1.15 2004/02/08 02:59:14 jlam Exp $
|
||||
|
||||
.if !defined(COMPILER_MIPSPRO_MK)
|
||||
COMPILER_MIPSPRO_MK= one
|
||||
|
|
@ -20,13 +20,16 @@ _MIPSPRO_LINKS= # empty
|
|||
. if !empty(_LANGUAGES.mipspro:Mc)
|
||||
_MIPSPRO_CC= ${_MIPSPRO_DIR}/bin/cc
|
||||
_MIPSPRO_LINKS+= _MIPSPRO_CC
|
||||
CC= ${_MIPSPRO_CC}
|
||||
CPP= ${_MIPSPRO_CC} -E
|
||||
PKG_CC= ${_MIPSPRO_CC}
|
||||
PKG_CPP= ${_MIPSPRO_CC} -E
|
||||
CC= ${PKG_CC:T}
|
||||
CPP= ${PKG_CPP:T}
|
||||
. endif
|
||||
. if !empty(_LANGUAGES.mipspro:Mc++)
|
||||
_MIPSPRO_CXX= ${_MIPSPRO_DIR}/bin/CC
|
||||
_MIPSPRO_LINKS+= _MIPSPRO_CXX
|
||||
CXX= ${_MIPSPRO_CXX}
|
||||
PKG_CXX= ${_MIPSPRO_CXX}
|
||||
CXX= ${PKG_CXX:T}
|
||||
. endif
|
||||
|
||||
. if exists(${MIPSPROBASE}/bin/cc)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: sunpro.mk,v 1.11 2004/02/07 02:58:10 jlam Exp $
|
||||
# $NetBSD: sunpro.mk,v 1.12 2004/02/08 02:59:14 jlam Exp $
|
||||
|
||||
.if !defined(COMPILER_SUNPRO_MK)
|
||||
COMPILER_SUNPRO_MK= one
|
||||
|
|
@ -20,13 +20,16 @@ _SUNPRO_LINKS= # empty
|
|||
. if !empty(_LANGUAGES.sunpro:Mc)
|
||||
_SUNPRO_CC= ${_SUNPRO_DIR}/bin/cc
|
||||
_SUNPRO_LINKS+= _SUNPRO_CC
|
||||
CC= ${_SUNPRO_CC}
|
||||
CPP= ${_SUNPRO_CC} -E
|
||||
PKG_CC= ${_SUNPRO_CC}
|
||||
PKG_CPP= ${_SUNPRO_CC} -E
|
||||
CC= ${PKG_CC:T}
|
||||
CPP= ${PKG_CPP:T}
|
||||
. endif
|
||||
. if !empty(_LANGUAGES.sunpro:Mc++)
|
||||
_SUNPRO_CXX= ${_SUNPRO_DIR}/bin/CC
|
||||
_SUNPRO_LINKS+= _SUNPRO_CXX
|
||||
CXX= ${_SUNPRO_CXX}
|
||||
PKG_CXX= ${_SUNPRO_CXX}
|
||||
CXX= ${PKG_CXX:T}
|
||||
. endif
|
||||
|
||||
_COMPILER_LD_FLAG= # empty
|
||||
|
|
|
|||
Loading…
Reference in a new issue