diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-29 00:08:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-29 00:08:51 +0000 |
| commit | 5e055b80427de94b9f47c087d34f2f340cf04bae (patch) | |
| tree | 5a23f6bb7f7010699b2c7eecc5102a32b98a1ece /lang/gcc | |
| parent | fa58b5c2733c619dbed19d1339056a9e7cc34045 (diff) | |
| download | pkgsrc-5e055b80427de94b9f47c087d34f2f340cf04bae.tar.gz | |
Ensure that the buildlink2 wrappers are found when searching for toolchain
subprograms, and that the lang/gcc libstdc++.so is found by the linker.
Diffstat (limited to 'lang/gcc')
| -rw-r--r-- | lang/gcc/buildlink2.mk | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/lang/gcc/buildlink2.mk b/lang/gcc/buildlink2.mk index e6f044a9de7..a71e10e81fc 100644 --- a/lang/gcc/buildlink2.mk +++ b/lang/gcc/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/09/27 13:56:33 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/09/29 00:08:51 jlam Exp $ .if !defined(GCC_BUILDLINK2_MK) GCC_BUILDLINK2_MK= # defined @@ -22,13 +22,17 @@ BUILDLINK_DEPMETHOD.gcc?= build .endif BUILDLINK_PREFIX.gcc= ${LOCALBASE} + .if ${OPSYS} == "SunOS" -_GCC_PREFIX= ${BUILDLINK_PREFIX.gcc} _GCC_SUBPREFIX= # empty .else -_GCC_PREFIX= ${BUILDLINK_PREFIX.gcc}/gcc-2.95.3 _GCC_SUBPREFIX= gcc-2.95.3/ .endif +_GCC_PREFIX= ${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX} +_GCC_ARCHSUBDIR= lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3 +_GCC_ARCHDIR= ${_GCC_PREFIX}${_GCC_ARCHSUBDIR} + +BUILDLINK_LDFLAGS.gcc= -Wl,-R${_GCC_ARCHDIR} .if defined(USE_PKGSRC_GCC) _NEED_PKGSRC_GCC= YES @@ -45,7 +49,7 @@ _GCC_PKG= gcc-${_GCC_VERSION} _NEED_PKGSRC_GCC!= \ if ${PKG_ADMIN} pmatch '${BUILDLINK_DEPENDS.gcc}' ${_GCC_PKG}; then \ gccpath=`${TYPE} gcc | ${AWK} '{ print $$NF }'`; \ - if [ "$$gccpath" = "${_GCC_PREFIX}/bin/gcc" ]; then \ + if [ "$$gccpath" = "${_GCC_PREFIX}bin/gcc" ]; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ @@ -57,19 +61,18 @@ _NEED_PKGSRC_GCC!= \ .if ${_NEED_PKGSRC_GCC} == "YES" BUILDLINK_PACKAGES+= gcc -PATH:= ${_GCC_PREFIX}/bin:${PATH} -CC= ${_GCC_PREFIX}/bin/gcc -CPP= ${_GCC_PREFIX}/bin/cpp -CXX= ${_GCC_PREFIX}/bin/g++ -F77= ${_GCC_PREFIX}/bin/g77 +PATH:= ${_GCC_PREFIX}bin:${PATH} +CC= ${_GCC_PREFIX}bin/gcc +CPP= ${_GCC_PREFIX}bin/cpp +CXX= ${_GCC_PREFIX}bin/g++ +F77= ${_GCC_PREFIX}bin/g77 PKG_FC= ${F77} -BUILDLINK_LDFLAGS.gcc= -Wl,-R${_GCC_PREFIX}/lib LDFLAGS+= ${BUILDLINK_LDFLAGS.gcc} +BUILDLINK_WRAPPER_ENV+= \ + COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH .endif # _NEED_PKGSRC_GCC == YES -_GCC_ARCHSUBDIR= lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3 - # These file are from gcc>=2.95.3. BUILDLINK_FILES.gcc= ${_GCC_SUBPREFIX}include/g++-3/* BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}include/g++-3/*/* |