From 6bef5e7621023d3e72298a3afdc528ba500d5166 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 14 Apr 2006 14:13:00 +0000
Subject: [PATCH] Don't have to pass ABI-related flags to mklib anymore.

---
 configs/darwin-static-x86ppc | 2 +-
 configs/darwin-x86ppc        | 2 +-
 configs/irix6-64             | 1 -
 configs/irix6-64-static      | 2 +-
 configs/irix6-n32            | 1 -
 configs/irix6-n32-static     | 2 +-
 configs/irix6-o32            | 1 -
 configs/irix6-o32-static     | 2 +-
 configs/sunos5-v9            | 4 ++--
 configs/sunos5-v9-static     | 2 +-
 10 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/configs/darwin-static-x86ppc b/configs/darwin-static-x86ppc
index 79415a3a375..844a1d2eade 100644
--- a/configs/darwin-static-x86ppc
+++ b/configs/darwin-static-x86ppc
@@ -9,7 +9,7 @@ CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
          -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
            -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-MKLIB_OPTIONS = -static -archopt "-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc
index b8b5acc4ef0..6006af23403 100644
--- a/configs/darwin-x86ppc
+++ b/configs/darwin-x86ppc
@@ -12,7 +12,7 @@ CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
 CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
          -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 
-MKLIB_OPTIONS = -archopt "-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.dylib
diff --git a/configs/irix6-64 b/configs/irix6-64
index df2d1426a47..a794627ba96 100644
--- a/configs/irix6-64
+++ b/configs/irix6-64
@@ -9,7 +9,6 @@ CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
-MKLIB_OPTIONS = -archopt 64
 
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 
diff --git a/configs/irix6-64-static b/configs/irix6-64-static
index e3d78558c9e..8e264412b88 100644
--- a/configs/irix6-64-static
+++ b/configs/irix6-64-static
@@ -9,7 +9,7 @@ CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
-MKLIB_OPTIONS = -archopt 64 -static
+MKLIB_OPTIONS = -static
 
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 
diff --git a/configs/irix6-n32 b/configs/irix6-n32
index 32def6a0a20..d42aa774846 100644
--- a/configs/irix6-n32
+++ b/configs/irix6-n32
@@ -9,7 +9,6 @@ CC = cc
 CXX = CC
 CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS
-MKLIB_OPTIONS = -archopt n32
 
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 
diff --git a/configs/irix6-n32-static b/configs/irix6-n32-static
index 0458590f0dc..74db4112160 100644
--- a/configs/irix6-n32-static
+++ b/configs/irix6-n32-static
@@ -9,7 +9,7 @@ CC = cc
 CXX = CC
 CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS
-MKLIB_OPTIONS = -archopt n32 -static
+MKLIB_OPTIONS = -static
 
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 
diff --git a/configs/irix6-o32 b/configs/irix6-o32
index 56a19796031..f26c988a996 100644
--- a/configs/irix6-o32
+++ b/configs/irix6-o32
@@ -9,7 +9,6 @@ CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
-MKLIB_OPTIONS = -archopt o32
 
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 
diff --git a/configs/irix6-o32-static b/configs/irix6-o32-static
index ec51b9cdc5a..468f67489d6 100644
--- a/configs/irix6-o32-static
+++ b/configs/irix6-o32-static
@@ -9,7 +9,7 @@ CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
-MKLIB_OPTIONS = -archopt o32 -static
+MKLIB_OPTIONS = -static
 
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 
diff --git a/configs/sunos5-v9 b/configs/sunos5-v9
index 68a746cb877..11f263a45b5 100644
--- a/configs/sunos5-v9
+++ b/configs/sunos5-v9
@@ -1,10 +1,10 @@
-# Configuration for SunOS 5
+# Configuration for SunOS 5, SPARC V9
 
 include $(TOP)/configs/default
 
 CONFIG_NAME = sunos5-v9
 
-MKLIB_OPTIONS = -archopt SUNV9 -cplusplus
+MKLIB_OPTIONS = -cplusplus
 
 LIB_DIR = $(TOP)/lib64
 
diff --git a/configs/sunos5-v9-static b/configs/sunos5-v9-static
index 264b23cd6d4..8cf4b636612 100644
--- a/configs/sunos5-v9-static
+++ b/configs/sunos5-v9-static
@@ -1,4 +1,4 @@
-# Configuration for SunOS 5
+# Configuration for SunOS 5, SPARC V9, static libs
 
 include $(TOP)/configs/default
 
-- 
2.30.2