From 73d4f69283cba75e85f5058e646d5fd2092f2f66 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 27 Oct 2003 18:24:37 +0000
Subject: [PATCH] Pass $(MKLIB_OPTIONS) to mklib script to allow setting extra
 options.

---
 Make-config           | 1 +
 src/mesa/Makefile.X11 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Make-config b/Make-config
index bb6b153b9c5..5f20adbc9fd 100644
--- a/Make-config
+++ b/Make-config
@@ -33,6 +33,7 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 # ASM_SOURCES    optional list of assembly language files to assemble
 # MAKELIB        the script or command to make a library file
 #                XXX MAKELIB is obsolete; edit bin/mklib to support new systems
+# MKLIB_OPTIONS  extra options to pass to the mklib script (like -arch)
 
 
 aix:
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index dd4336e6d02..4e00648e453 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -307,7 +307,7 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB) $(LIBMESA)
 $(LIBDIR)/$(GL_LIB): $(OBJECTS)
 	$(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \
 		-minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \
-		$(GL_LIB_DEPS) $(OBJECTS)
+		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS)
 
 
 # Make the OSMesa library
@@ -316,7 +316,7 @@ $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS)
 		$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
 			-minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
 			-l$(GL_LIB_NAME) -install $(LIBDIR) \
-			$(OSMESA_OBJECTS) ; \
+			$(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
 	fi
 
 
-- 
2.30.2