[PATCH] Makefile: skip LIB resolve check if NATIVEONLY

[Alyssa Ross]

If only one architecture is being built for, it doesn't matter if
LIB32 and LIB64 point to the same place, since only one of them will
be used.

Signed-off-by: Alyssa Ross <h...@alyssa.is>
---
Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a107a62..d2f2ab6 100644
--- a/Makefile
+++ b/Makefile
@@ -169,9 +169,10 @@ ifeq ($(CUSTOM_LDSCRIPTS),yes)
TEST_LDSCRIPTS = -l
endif

-# If TMPLIB64 is set, then sure we are not resolving LIB32 and LIB64 to the
-# same place
+# If building for both 32- and 64-bit, then make sure we are not resolving
+# LIB32 and LIB64 to the same place
ifdef TMPLIB64
+ifneq ($(BUILDTYPE),NATIVEONLY)

REALLIB32 = $(realpath $(PREFIX)/$(LIB32))
REALLIB64 = $(realpath $(PREFIX)/$(LIB64))
@@ -181,6 +182,7 @@ $(error LIB32 ($(PREFIX)/$(LIB32) to $(REALLIB32)) and LIB64 ($(PREFIX)/$(LIB64)
endif
endif

+endif
endif

HEADERDIR = $(PREFIX)/include
--
2.27.0

[Eric B Munson]

On Sat, 25 Jul 2020, Alyssa Ross wrote:

> If only one architecture is being built for, it doesn't matter if
> LIB32 and LIB64 point to the same place, since only one of them will
> be used.
>
> Signed-off-by: Alyssa Ross <h...@alyssa.is>

Applied, thanks.

Eric