diff options
author | tv <tv> | 2005-03-24 17:46:00 +0000 |
---|---|---|
committer | tv <tv> | 2005-03-24 17:46:00 +0000 |
commit | becbeb0d92ed90e67235a5d22f77020cb7d29952 (patch) | |
tree | d810c92114f578110af57e0a04897d51e7bceb57 /mk/compiler/gcc.mk | |
parent | bbdac93695f620db587d57e13966052e8dffd9a5 (diff) | |
download | pkgsrc-becbeb0d92ed90e67235a5d22f77020cb7d29952.tar.gz |
USE_BUILDLINK3 is no longer optional (and cannot be turned off). Per mail
to tech-pkg:
=====
* USE_BUILDLINK3=YES will be unconditional. (In fact, USE_BUILDLINK3 will
be ignored altogether by mk/; but see below.)
* NO_BUILDLINK and NO_WRAPPER will be ignored by mk/. If a build happens,
these phases will happen.
* The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER.
If no build happens, those phases are not needed.
* NO_TOOLS will be ignored by mk/. The tools phase, which provides much
more than just the C compiler, will always happen regardless of package.
This will make metapackage builds only slightly slower, in trade for far
less user error.
Diffstat (limited to 'mk/compiler/gcc.mk')
-rw-r--r-- | mk/compiler/gcc.mk | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk index 60b47b13a0e..559c4bf4854 100644 --- a/mk/compiler/gcc.mk +++ b/mk/compiler/gcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.79 2005/01/21 21:59:14 tv Exp $ +# $NetBSD: gcc.mk,v 1.80 2005/03/24 17:46:01 tv Exp $ .if !defined(COMPILER_GCC_MK) COMPILER_GCC_MK= defined @@ -403,17 +403,9 @@ PREPEND_PATH+= ${_GCC_DIR}/bin # Add the dependency on GCC. .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) -. if !empty(USE_BUILDLINK3:M[yY][eE][sS]) -. for _dir_ in ${_GCC_PKGSRCDIR} -. include "${_dir_}/buildlink3.mk" -. endfor -. else -. if defined(_USE_GCC_SHLIB) -DEPENDS+= ${_GCC_DEPENDENCY} -. else -BUILD_DEPENDS+= ${_GCC_DEPENDENCY} -. endif -. endif +. for _dir_ in ${_GCC_PKGSRCDIR} +. include "${_dir_}/buildlink3.mk" +. endfor .endif # Create compiler driver scripts in ${WRKDIR}. |