diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2010-10-25 18:36:56 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2010-10-25 18:36:56 +0000 |
| commit | a720cd4fc991c6179a770fddc021ef6585503d7f (patch) | |
| tree | 5704175edc6be26a705e64123a681cb56916c914 /Mk | |
| parent | The proggy programmer's fonts (Proggy Clean, Proggy Square, Proggy Small, (diff) | |
- Pass CPP to CONFIGURE_ENV and MAKE_ENV [1]
- fix fetch-required-list output [2]
PR: 151047 [1],
145955 [2]
Submitted by: gerald [1],
Martin Simmons <martin@lispworks.com> [2]
Notes
Notes:
svn path=/head/; revision=263583
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 87dab52f0077..6eaaba968e5b 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2276,7 +2276,8 @@ MAKEFILE?= Makefile MAKE_ENV+= PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \ - CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ + CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ MANPREFIX="${MANPREFIX}" # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher. @@ -3781,7 +3782,7 @@ do-configure: .if defined(HAS_CONFIGURE) @(cd ${CONFIGURE_WRKSRC} && \ ${SET_LATE_CONFIGURE_ARGS} \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ + if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ INSTALL_DATA="${INSTALL_DATA}" \ @@ -5374,7 +5375,7 @@ FETCH_LIST?= for i in $$deps; do \ continue; \ fi;; \ esac; \ - echo cd $$dir; ${MAKE} $$targ; \ + echo cd $$dir; cd $$dir; ${MAKE} $$targ; \ done .if !target(fetch-required) |