Mercurial > unleashed > wips
changeset 20712:47811baf5bcf draft
fix-genuinx-unix-bitness-build
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Fri, 12 Jan 2018 18:55:03 -0500 |
| parents | 111ccb776e79 |
| children | 19a497eb10bf |
| files | kernel/mk/genunix-subsys.mk |
| diffstat | 1 files changed, 8 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/kernel/mk/genunix-subsys.mk Fri Jan 12 18:49:53 2018 -0500 +++ b/kernel/mk/genunix-subsys.mk Fri Jan 12 18:55:03 2018 -0500 @@ -17,35 +17,17 @@ .include <${SRCTOP}/Makefile.cfgparam> .include <bsd.subdir.mk> -BUILD= -.if defined(CONFIG_BUILD_KMOD_32) && ${CONFIG_BUILD_KMOD_32} == "y" -BUILD += 32 -.endif -.if defined(CONFIG_BUILD_KMOD_64) && ${CONFIG_BUILD_KMOD_64} == "y" -BUILD += 64 -.endif - -all: ${BUILD:%=genunix-%} ${BUILD:%=unix-%} - -genunix-32: ${GENUNIX_SUBDIR} - @mkdir -p obj32 - @${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk genunix \ - BITS=32 SRCTOP=${SRCTOP} BUILD_GENUNIX=yes +all: genunix unix -genunix-64: ${GENUNIX_SUBDIR} - @mkdir -p obj64 +genunix: ${GENUNIX_SUBDIR} + @mkdir -p obj${CONFIG_KERNEL_BITS} @${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk genunix \ - BITS=64 SRCTOP=${SRCTOP} BUILD_GENUNIX=yes + BITS=${CONFIG_KERNEL_BITS} SRCTOP=${SRCTOP} BUILD_GENUNIX=yes -unix-32: ${UNIX_SUBDIR} - @mkdir -p obj32 +unix: ${UNIX_SUBDIR} + @mkdir -p obj${CONFIG_KERNEL_BITS} @${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk unix \ - BITS=32 SRCTOP=${SRCTOP} BUILD_GENUNIX=no - -unix-64: ${UNIX_SUBDIR} - @mkdir -p obj64 - @${MAKE} -f ${SRCTOP}/kernel/mk/genunix-build-subsys.mk unix \ - BITS=64 SRCTOP=${SRCTOP} BUILD_GENUNIX=no + BITS=${CONFIG_KERNEL_BITS} SRCTOP=${SRCTOP} BUILD_GENUNIX=no clean cleandir: @rm -rf obj32 obj64 @@ -53,7 +35,6 @@ install: .PHONY: all clean cleandir install -.PHONY: genunix-32 genunix-64 -.PHONY: unix-32 unix-64 +.PHONY: genunix unix .endif