| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | # $NetBSD: bootstrap.mk,v 1.14 2015/02/05 00:26:34 pho Exp $ | | 1 | # $NetBSD: bootstrap.mk,v 1.15 2015/02/05 00:38:14 pho Exp $ |
| 2 | # ----------------------------------------------------------------------------- | | 2 | # ----------------------------------------------------------------------------- |
| 3 | # Select a bindist of bootstrapping compiler based on a per-platform | | 3 | # Select a bindist of bootstrapping compiler based on a per-platform |
| 4 | # basis. | | 4 | # basis. |
| 5 | # | | 5 | # |
| 6 | # BOOT_ARCHIVE | | 6 | # BOOT_ARCHIVE |
| 7 | # This variable is set to the name of compressed archive file of a | | 7 | # This variable is set to the name of compressed archive file of a |
| 8 | # bootstrapping compiler for the current platform. | | 8 | # bootstrapping compiler for the current platform. |
| 9 | # | | 9 | # |
| 10 | # BOOT_TARBALL | | 10 | # BOOT_TARBALL |
| 11 | # Similar to BOOT_ARCHIVE, but "*.tar" not "*.tar.xz". | | 11 | # Similar to BOOT_ARCHIVE, but "*.tar" not "*.tar.xz". |
| 12 | # | | 12 | # |
| 13 | .include "../../mk/bsd.prefs.mk" | | 13 | .include "../../mk/bsd.prefs.mk" |
| 14 | .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD" | | 14 | .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD" |
| @@ -88,26 +88,28 @@ pre-configure: | | | @@ -88,26 +88,28 @@ pre-configure: |
| 88 | # Gather information about packages on which bootkit depends. | | 88 | # Gather information about packages on which bootkit depends. |
| 89 | BOOT_GHC_DEPS:= curses iconv | | 89 | BOOT_GHC_DEPS:= curses iconv |
| 90 | BOOT_GHC_PKGSRC_DEPS:= # empty | | 90 | BOOT_GHC_PKGSRC_DEPS:= # empty |
| 91 | .for pkg in ${BOOT_GHC_DEPS} | | 91 | .for pkg in ${BOOT_GHC_DEPS} |
| 92 | | | 92 | |
| 93 | CHECK_BUILTIN.${pkg}:= yes | | 93 | CHECK_BUILTIN.${pkg}:= yes |
| 94 | . if ${pkg} == "curses" | | 94 | . if ${pkg} == "curses" |
| 95 | . include "../../mk/curses.builtin.mk" | | 95 | . include "../../mk/curses.builtin.mk" |
| 96 | . elif ${pkg} == "iconv" | | 96 | . elif ${pkg} == "iconv" |
| 97 | . include "../../converters/libiconv/builtin.mk" | | 97 | . include "../../converters/libiconv/builtin.mk" |
| 98 | . endif | | 98 | . endif |
| 99 | CHECK_BUILTIN.${pkg}:= no | | 99 | CHECK_BUILTIN.${pkg}:= no |
| 100 | | | 100 | |
| | | 101 | # BOOT_GHC_PKGSRC_DEPS is a list of packages whose pkgsrc version is |
| | | 102 | # preferred over native one, either by user or ../../mk/platform |
| 101 | . if ${PREFER.${pkg}} == "pkgsrc" | | 103 | . if ${PREFER.${pkg}} == "pkgsrc" |
| 102 | BOOT_GHC_PKGSRC_DEPS+= ${pkg} | | 104 | BOOT_GHC_PKGSRC_DEPS+= ${pkg} |
| 103 | . endif | | 105 | . endif |
| 104 | .endfor | | 106 | .endfor |
| 105 | | | 107 | |
| 106 | # Compiler wrappers must not remove -I/-L flags for this directory | | 108 | # Compiler wrappers must not remove -I/-L flags for this directory |
| 107 | # tree, otherwise the GHC we are going to use for building our | | 109 | # tree, otherwise the GHC we are going to use for building our |
| 108 | # bootstraping kit will not work at all. Ideally it should be added to | | 110 | # bootstraping kit will not work at all. Ideally it should be added to |
| 109 | # BUILDLINK_PASSTHRU_DIRS only .if make(bootstrap), but then running | | 111 | # BUILDLINK_PASSTHRU_DIRS only .if make(bootstrap), but then running |
| 110 | # "${MAKE} wrapper" before "${MAKE} bootstrap" will result in a | | 112 | # "${MAKE} wrapper" before "${MAKE} bootstrap" will result in a |
| 111 | # cryptic error which we can't easily catch. | | 113 | # cryptic error which we can't easily catch. |
| 112 | BOOT_GHC_LIBDIR_CMD= ghc --print-libdir | | 114 | BOOT_GHC_LIBDIR_CMD= ghc --print-libdir |
| 113 | .if !defined(BOOT_GHC_LIBDIR) | | 115 | .if !defined(BOOT_GHC_LIBDIR) |