diff options
| author | grant <grant> | 2003-07-13 13:27:18 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-07-13 13:27:18 +0000 |
| commit | 888aacc68c1a128f2806be185f762efc3498db87 (patch) | |
| tree | 5fe6f30c8687f6e4329c4924b1d0a545a1a8fcdf | |
| parent | e090734d623a7791745dc3e5fa2307d0af319d66 (diff) | |
| download | pkgsrc-888aacc68c1a128f2806be185f762efc3498db87.tar.gz | |
move gcc selection back to bsd.pkg.mk as the top-level Makefile
includes bsd.prefs.mk.
| -rw-r--r-- | mk/bsd.pkg.mk | 16 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6e68498d2d6..dc6f4504ead 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1215 2003/07/13 13:10:43 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216 2003/07/13 13:27:18 grant Exp $ # # This file is in the public domain. # @@ -314,6 +314,20 @@ MAKE_ENV+= CXX="${CXX}" MAKE_ENV+= CPP="${CPP}" .endif +# Ensure the correct rpath is passed to the linker to enable packages +# to find shared libraries from gcc. Has no effect when pkgsrc gcc is +# not being used. +# +# Valid compilers are: +# +# USE_GCC2 - GNU Compiler Collection 2.x +# USE_GCC3 - GNU Compiler Collection 3.x +# USE_MIPSPRO - Silicon Graphics, Inc. MIPSpro Compiler +# USE_SUNPRO - Sun Microsystems, Inc. WorkShop/Forte/Sun ONE Studio +# Compiler Collection +# +.include "../../mk/gcc.buildlink2.mk" + # export the flags needed to compile and link pthreaded code MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" MAKE_ENV+= PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}" diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 581a2286a30..93c52382d44 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.117 2003/07/13 13:10:43 grant Exp $ +# $NetBSD: bsd.prefs.mk,v 1.118 2003/07/13 13:27:18 grant Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -343,18 +343,4 @@ _COMPILER_LD_FLAG= # pattern for Sun compilers _COMPILER_LD_FLAG= -Wl, # pattern for GCC and others .endif -# Ensure the correct rpath is passed to the linker to enable packages -# to find shared libraries from gcc. Has no effect when pkgsrc gcc is -# not being used. -# -# Valid compilers are: -# -# USE_GCC2 - GNU Compiler Collection 2.x -# USE_GCC3 - GNU Compiler Collection 3.x -# USE_MIPSPRO - Silicon Graphics, Inc. MIPSpro Compiler -# USE_SUNPRO - Sun Microsystems, Inc. WorkShop/Forte/Sun ONE Studio -# Compiler Collection -# -.include "../../mk/gcc.buildlink2.mk" - .endif # BSD_PKG_MK |