From fae1cab2a12d439f738acfe35da4ce45dcf6caf1 Mon Sep 17 00:00:00 2001
From: Jim Klimov <jim@jimklimov.com>
Date: Mon, 18 Jul 2016 10:37:37 +0200
Subject: [PATCH] Extend shared-macros.mk with *.$(BITS) suffixed USR and GNU paths (BIN, SBIN, LIB) for default=32bit vs extended=64bit setups
---
make-rules/shared-macros.mk | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk
index 5e94717..da7cb1a 100644
--- a/make-rules/shared-macros.mk
+++ b/make-rules/shared-macros.mk
@@ -149,6 +149,15 @@
USRKERNELDRVDIR32 = $(USRDIR)/kernel/drv
USRKERNELDRVDIR64 = $(USRDIR)/kernel/drv/$(MACH64)
+# The *.$(BITS) variables are different from those above (better suited for
+# isaexec wrapper), and allow for default 32-bit vs. nondefault 64-bit setups
+USRBINDIR.32 = $(USRBINDIR)
+USRBINDIR.64 = $(USRBINDIR64)
+USRSBINDIR.32 = $(USRSBINDIR)
+USRSBINDIR.64 = $(USRSBINDIR64)
+USRLIBDIR.32 = $(USRLIBDIR)
+USRLIBDIR.64 = $(USRLIBDIR64)
+
PROTOETCDIR = $(PROTO_DIR)/$(ETCDIR)
PROTOETCSECDIR = $(PROTO_DIR)/$(ETCDIR)/security
PROTOUSRDIR = $(PROTO_DIR)/$(USRDIR)
@@ -184,6 +193,12 @@
PROTOUSRKERNELDRVDIR32 = $(PROTO_DIR)/$(USRKERNELDRVDIR32)
PROTOUSRKERNELDRVDIR64 = $(PROTO_DIR)/$(USRKERNELDRVDIR64)
+PROTOUSRBINDIR.32 = $(PROTOUSRBINDIR)
+PROTOUSRBINDIR.64 = $(PROTOUSRBINDIR64)
+PROTOUSRSBINDIR.32 = $(PROTOUSRSBINDIR)
+PROTOUSRSBINDIR.64 = $(PROTOUSRSBINDIR64)
+PROTOUSRLIBDIR.32 = $(PROTOUSRLIBDIR)
+PROTOUSRLIBDIR.64 = $(PROTOUSRLIBDIR64)
SFWBIN = /usr/sfw/bin
SFWINCLUDE = /usr/sfw/include
@@ -228,6 +243,21 @@
PROTOGNUSHAREMAN = $(PROTO_DIR)/$(GNUSHAREMAN)
PROTOGNUSHAREMAN1 = $(PROTO_DIR)/$(GNUSHAREMAN1)
+# The *.$(BITS) variables are different from those above (better suited for
+# isaexec wrapper), and allow for default 32-bit vs. nondefault 64-bit setups
+GNUBIN.32 = $(GNUBIN)
+GNUBIN.64 = $(GNUBIN64)
+GNUSBIN.32 = $(GNUSBIN)
+GNUSBIN.64 = $(GNUSBIN64)
+GNULIB.32 = $(GNULIB)
+GNULIB.64 = $(GNULIB64)
+PROTOGNUBIN.32 = $(PROTOGNUBIN)
+PROTOGNUBIN.64 = $(PROTOGNUBIN64)
+PROTOGNUSBIN.32 = $(PROTOGNUSBIN)
+PROTOGNUSBIN.64 = $(PROTOGNUSBIN64)
+PROTOGNULIB.32 = $(PROTOGNULIB)
+PROTOGNULIB.64 = $(PROTOGNULIB64)
+
# work around _TIME, _DATE, embedded date chatter in component builds
# to use, set TIME_CONSTANT in the component Makefile and add $(CONSTANT_TIME)
# to the appropriate {CONFIGURE|BUILD|INSTALL}_ENV
--
Gitblit v1.9.3