From 967dcbccf40df5be139409142e8dcf125b37817b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dexter=20Castor=20D=C3=B6pping?= Date: Wed, 15 Dec 2021 22:36:50 +0100 Subject: [PATCH] Fix build failing for libnh when using TARGETPFX Compiling with WANT_LIBNH=1 and TARGETPFX=(...) failed because ioctl.o could not be found. This is because the targets are specified with the $(TARGETPFX) but the libnh targets consumed these targets without the $(TARGETPFX). --- sys/unix/hints/linux.2020 | 5 +++-- sys/unix/hints/macOS.2020 | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.2020 index 76701643c..523853653 100755 --- a/sys/unix/hints/linux.2020 +++ b/sys/unix/hints/linux.2020 @@ -155,8 +155,9 @@ LIBNHSYSSRC = ../sys/libnh/libnhmain.c \ ../sys/share/ioctl.c ../sys/share/unixtty.c \ ../sys/unix/unixunix.c ../sys/unix/unixres.c \ ../win/shim/winshim.c -LIBNHSYSOBJ= libnhmain.o ioctl.o unixtty.o unixunix.o \ - unixres.o winshim.o +LIBNHSYSOBJ = libnhmain.o $(TARGETPFX)ioctl.o \ + $(TARGETPFX)unixtty.o $(TARGETPFX)unixunix.o \ + $(TARGETPFX)unixres.o winshim.o #don't bother building the game executable as it will fail #without winshim override GAME= diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.2020 index 8f8de9088..0cee67202 100755 --- a/sys/unix/hints/macOS.2020 +++ b/sys/unix/hints/macOS.2020 @@ -155,8 +155,9 @@ LIBNHSYSSRC = ../sys/libnh/libnhmain.c \ ../sys/share/ioctl.c ../sys/share/unixtty.c \ ../sys/unix/unixunix.c ../sys/unix/unixres.c \ ../win/shim/winshim.c -LIBNHSYSOBJ= libnhmain.o ioctl.o unixtty.o unixunix.o \ - unixres.o winshim.o +LIBNHSYSOBJ = libnhmain.o $(TARGETPFX)ioctl.o \ + $(TARGETPFX)unixtty.o $(TARGETPFX)unixunix.o \ + $(TARGETPFX)unixres.o winshim.o #don't bother building the game executable as it will fail #without winshim override GAME=