diff options
author | grant <grant> | 2003-07-13 13:27:18 +0000 |
---|---|---|
committer | grant <grant> | 2003-07-13 13:27:18 +0000 |
commit | c28452ac46908bea3d7b5c592e0d4aa129cb1bfd (patch) | |
tree | 5fe6f30c8687f6e4329c4924b1d0a545a1a8fcdf /mk/bsd.pkg.mk | |
parent | c4385d70fd33d99b0e669e0c2eb0bb6b35831def (diff) | |
download | pkgsrc-c28452ac46908bea3d7b5c592e0d4aa129cb1bfd.tar.gz |
move gcc selection back to bsd.pkg.mk as the top-level Makefile
includes bsd.prefs.mk.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 15 insertions, 1 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}" |