From 3df232b53c35f12792765ce200ca8f52310556e5 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 22 Jan 2010 18:03:11 +0900 Subject: [PATCH] Fix: ghc-asm fails when PLATFORM=powerpc-unknown-darwin --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 399d09d..9d18724 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,6 @@ CONFIGURE_ENV+= PerlCmd=${PERL5:Q} # We don't want to extract all of the DISTFILEs. EXTRACT_ONLY= ${DISTNAME}-src.tar.bz2 -PLATFORM= ${MACHINE_ARCH}-unknown-${LOWER_OPSYS} CONFIGURE_ARGS += \ --build=${PLATFORM} \ --host=${PLATFORM} \ @@ -71,16 +70,17 @@ CONFIGURE_ARGS += \ # running "ghc-pkg recache". .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD" -BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk +PLATFORM = i386-unknown-netbsd .elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD" -BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk +PLATFORM = i386-unknown-freebsd .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" -BOOTSTRAP_TARBALL = ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk +PLATFORM = powerpc-apple-darwin + # Existence of libelf makes LeadingUnderscore being "NO", which is # incorrect. See ghc-6.12.1/aclocal.m4 (FP_LEADING_UNDERSCORE) CONFLICTS= libelf-[0-9]* @@ -89,6 +89,8 @@ CONFLICTS= libelf-[0-9]* PKG_FAIL_REASON+= "internal error: unsupported platform" .endif +BOOTSTRAP_TARBALL = ${DISTNAME}-boot-${PLATFORM}.tar.bz2 + pre-configure: ${RUN} cd ${WRKDIR} && \ ${ECHO} "====> Preparing bootstrap compiler" && \ -- 2.40.0