diff options
| author | wiz <wiz@pkgsrc.org> | 2016-06-19 16:20:27 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-06-19 16:20:27 +0000 |
| commit | a64e057e64143d82a16d1c6f7c6a095eabcb57bf (patch) | |
| tree | 6a373681a5f97a93b4a15f88ca5d90bede887f79 /cross/mingw | |
| parent | b2bf46cfab979f7fe2c7b6bd91667a5a62197e68 (diff) | |
| download | pkgsrc-a64e057e64143d82a16d1c6f7c6a095eabcb57bf.tar.gz | |
Move remaining users of USE_CROSSBASE to just install into ${PREFIX}/cross.
To simplify infrastructure.
Ok joerg@
XXX: nios2-gcc3 loops endlessly during build, before and after change,
so untested.
XXX: nios2-gcc does not build on -current, in the same way before
and after the change, so untested.
Diffstat (limited to 'cross/mingw')
| -rw-r--r-- | cross/mingw/Makefile | 3 | ||||
| -rw-r--r-- | cross/mingw/Makefile.common | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/cross/mingw/Makefile b/cross/mingw/Makefile index 808c4cfe15a..9281ba31910 100644 --- a/cross/mingw/Makefile +++ b/cross/mingw/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/03/15 18:34:36 asau Exp $ -# +# $NetBSD: Makefile,v 1.2 2016/06/19 16:20:27 wiz Exp $ DISTNAME= mingw-3.3.1 CATEGORIES= cross diff --git a/cross/mingw/Makefile.common b/cross/mingw/Makefile.common index 95a1a607b7b..13d078a3347 100644 --- a/cross/mingw/Makefile.common +++ b/cross/mingw/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2014/12/10 23:21:40 joerg Exp $ +# $NetBSD: Makefile.common,v 1.3 2016/06/19 16:20:27 wiz Exp $ # # used by cross/mingw-gcc/buildlink3.mk # used by cross/mingw-binutils/Makefile @@ -8,7 +8,6 @@ .if !defined(MINGW_MAKEFILECOMMON) MINGW_MAKEFILECOMMON= # defined -USE_CROSSBASE= yes MASTER_SITE_MINGW= ${MASTER_SITE_SOURCEFORGE:=mingw/} MINGW_TARGET?= i386--mingw32 @@ -16,11 +15,10 @@ PLIST_SUBST+= MINGW_TARGET=${MINGW_TARGET:Q} MAKE_ENV+= MINGW_TARGET=${MINGW_TARGET:Q} CONFIGURE_ENV+= MINGW_TARGET=${MINGW_TARGET:Q} -PREPEND_PATH+= ${CROSSBASE}/bin +PREPEND_PATH+= ${PREFIX}/cross/bin .if defined(GNU_CONFIGURE) -CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -CONFIGURE_ARGS+= --exec-prefix=${PREFIX:Q} +GNU_CONFIGURE_PREFIX= ${PREFIX}/cross CONFIGURE_ARGS+= --target=${MINGW_TARGET:Q} # following line to avoid getting # make: exec(i386--netbsdelf-ar) failed (No such file or directory) |