From 6ecc9b7c3f0d2afd630dee0faf9cf8fdb4976fc4 Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@nigels.com>
Date: Mon, 28 Jan 2019 10:58:35 +1000
Subject: [PATCH] Ignore arch for Linux gcc and clang builds

---
 config/Makefile.linux       | 19 +++----------------
 config/Makefile.linux-clang | 19 +++----------------
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/config/Makefile.linux b/config/Makefile.linux
index 50b813c..5c76e37 100644
--- a/config/Makefile.linux
+++ b/config/Makefile.linux
@@ -1,24 +1,11 @@
 NAME = $(GLEW_NAME)
 CC = cc
 LD = cc
-M_ARCH ?= $(shell uname -m)
-ARCH64 = false
-ifeq (x86_64,${M_ARCH})
-  ARCH64 = true
-endif
-ifeq (ppc64,${M_ARCH})
-  ARCH64 = true
-endif
-ifeq (${ARCH64},true)
-  LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
-  LIBDIR = $(GLEW_DEST)/lib64
-else
-  LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
-  LIBDIR = $(GLEW_DEST)/lib
-endif
+LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
+LIBDIR = $(GLEW_DEST)/lib
 LDFLAGS.GL = -lGL -lX11
 LDFLAGS.STATIC = -Wl,-Bstatic
-LDFLAGS.DYNAMIC = -Wl,-Bdynamic
+LDFLAGS.DYNAMIC = -Wl,-Bdynamic,-rpath,$(LIBDIR)
 NAME = GLEW
 WARN = -Wall -W
 POPT = -O2
diff --git a/config/Makefile.linux-clang b/config/Makefile.linux-clang
index 2992b89..78189ca 100644
--- a/config/Makefile.linux-clang
+++ b/config/Makefile.linux-clang
@@ -1,24 +1,11 @@
 NAME = $(GLEW_NAME)
 CC = clang
 LD = clang
-M_ARCH ?= $(shell uname -m)
-ARCH64 = false
-ifeq (x86_64,${M_ARCH})
-  ARCH64 = true
-endif
-ifeq (ppc64,${M_ARCH})
-  ARCH64 = true
-endif
-ifeq (${ARCH64},true)
-  LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
-  LIBDIR = $(GLEW_DEST)/lib64
-else
-  LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
-  LIBDIR = $(GLEW_DEST)/lib
-endif
+LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
+LIBDIR = $(GLEW_DEST)/lib
 LDFLAGS.GL = -lGL -lX11
 LDFLAGS.STATIC = -Wl,-Bstatic
-LDFLAGS.DYNAMIC = -Wl,-Bdynamic
+LDFLAGS.DYNAMIC = -Wl,-Bdynamic,-rpath,$(LIBDIR)
 NAME = GLEW
 WARN = -Wall -W
 POPT = -O2