From: Dima Kogan <dima@secretsauce.net>
Date: Fri, 22 Nov 2013 14:19:13 -0800
Subject: removed architecture detection logic

This isn't needed on debian, and builds were failing on i386 machines since the
detection was seeing a 64-bit system for some reason
---
 Makefile        | 64 ++++-----------------------------------------------------
 make/bin.mak    | 18 ----------------
 make/dll.mak    | 22 --------------------
 make/matlab.mak | 62 -------------------------------------------------------
 make/octave.mak |  8 --------
 5 files changed, 4 insertions(+), 170 deletions(-)

diff --git a/Makefile b/Makefile
index fd0e3b4..1182858 100644
--- a/Makefile
+++ b/Makefile
@@ -105,12 +105,6 @@ all:
 #                                                       Error Messages
 # --------------------------------------------------------------------
 
-err_no_arch  =
-err_no_arch +=$(shell echo "** Unknown host architecture '$(UNAME)'. This identifier"   1>&2)
-err_no_arch +=$(shell echo "** was obtained by running 'uname -sm'. Edit the Makefile " 1>&2)
-err_no_arch +=$(shell echo "** to add the appropriate configuration."                   1>&2)
-err_no_arch +=config
-
 err_internal  =$(shell echo Internal error)
 err_internal +=internal
 
@@ -122,22 +116,7 @@ err_spaces +=spaces
 #                                             Auto-detect architecture
 # --------------------------------------------------------------------
 
-Darwin_PPC_ARCH := mac
-Darwin_Power_Macintosh_ARCH := mac
-Darwin_i386_ARCH := maci64
-Darwin_x86_64_ARCH := maci64
-Linux_i386_ARCH := glnx86
-Linux_i686_ARCH := glnx86
-Linux_unknown_ARCH := glnx86
-Linux_x86_64_ARCH := glnxa64
-
-UNAME := $(shell uname -sm)
-ARCH ?= $($(shell echo "$(UNAME)" | tr \  _)_ARCH)
-
-# sanity check
-ifeq ($(ARCH),)
-die:=$(error $(err_no_arch))
-endif
+ARCH := debian
 
 ifneq ($(VLDIR),$(shell echo "$(VLDIR)" | sed 's/ //g'))
 die:=$(error $(err_spaces))
@@ -206,46 +185,12 @@ DISABLE_OPENMP:=yes
 endif
 endif
 
-# Mac OS X Intel
-ifeq "$(ARCH)" "$(filter $(ARCH),maci maci64)"
-ifeq "$(ARCH)" "maci"
-march=32
-else
-march=64
-endif
-SDKROOT ?= $(shell xcrun -sdk macosx --show-sdk-path)
-MACOSX_DEPLOYMENT_TARGET ?= 10.4
-STD_CFLAGS += -m$(march) -isysroot $(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
-STD_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
-endif
-
-# Linux
-ifeq "$(ARCH)" "$(filter $(ARCH),glnx86 glnxa64)"
-ifeq "$(ARCH)" "glnx86"
-march=32
-else
-march=64
-endif
 # Target compatibility with GLIBC 2.3.4
 # 1) _GNU_SOURCE avoids using isoc99_fscanf, limiting binary portability to recent GLIBC.
 # 2) -fno-stack-protector avoids using a feature requiring GLBIC 2.4
-STD_CFLAGS += -m$(march) -D_GNU_SOURCE -fno-stack-protector
-STD_LDFLAGS += -m$(march) -Wl,--rpath,\$$ORIGIN/ -Wl,--as-needed
-endif
-
-# Convert back DISALBE_*="no" flags to be empty
-ifeq "$(DISABLE_SSE2)" "no"
-override DISABLE_SSE2:=
-endif
-ifeq "$(DISABLE_AVX)" "no"
-override DISABLE_AVX:=
-endif
-ifeq "$(DISABLE_THREADS)" "no"
-override DISABLE_THREADS:=
-endif
-ifeq "$(DISABLE_OPENMP)" "no"
-override DISABLE_OPENMP:=
-endif
+STD_CFLAGS += -D_GNU_SOURCE -fno-stack-protector
+STD_LDFLAGS += -Wl,--as-needed -lpthread -lm
+CC ?= gcc
 
 # --------------------------------------------------------------------
 #                                                            Functions
@@ -349,7 +294,6 @@ info:
 	$(call echo-var,PROFILE)
 	$(call echo-var,DEBUG)
 	$(call echo-var,VER)
-	$(call echo-var,ARCH)
 	$(call echo-var,CC)
 	$(call echo-var,COMPILER)
 	$(call echo-var,COMPILER_VER)
diff --git a/make/bin.mak b/make/bin.mak
index bc4cdb8..5a01860 100644
--- a/make/bin.mak
+++ b/make/bin.mak
@@ -26,24 +26,6 @@ BIN_LDFLAGS = $(STD_LDFLAGS) -L$(BINDIR) -lvl -lm
 BIN_LDFLAGS += $(if $(DISABLE_THREADS),,-lpthread)
 BIN_LDFLAGS += $(if $(DISABLE_OPENMP),,-fopenmp)
 
-# Mac OS X Intel 32
-ifeq ($(ARCH),maci)
-endif
-
-# Mac OS X Intel 64
-ifeq ($(ARCH),maci64)
-endif
-
-# Linux-32
-ifeq ($(ARCH),glnx86)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
-# Linux-64
-ifeq ($(ARCH),glnxa64)
-BIN_LDFLAGS += -Wl,--rpath,\$$ORIGIN/
-endif
-
 # --------------------------------------------------------------------
 #                                                                Build
 # --------------------------------------------------------------------
diff --git a/make/dll.mak b/make/dll.mak
index 7b1f30a..eb2ebf5 100644
--- a/make/dll.mak
+++ b/make/dll.mak
@@ -53,29 +53,7 @@ $(if $(DISABLE_OPENMP),,-fopenmp)
 
 BINDIR = bin/$(ARCH)
 
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
-DLL_SUFFIX := dylib
-DLL_LDFLAGS += -m32
-endif
-
-# Mac OS X on Intel 64 bit processor
-ifeq ($(ARCH),maci64)
-DLL_SUFFIX := dylib
-DLL_LDFLAGS += -m64
-endif
-
-# Linux-32
-ifeq ($(ARCH),glnx86)
 DLL_SUFFIX := so
-DLL_LDFLAGS += -m32
-endif
-
-# Linux-64
-ifeq ($(ARCH),glnxa64)
-DLL_SUFFIX := so
-DLL_LDFLAGS += -m64
-endif
 
 # --------------------------------------------------------------------
 #                                                                Build
diff --git a/make/matlab.mak b/make/matlab.mak
index d06fae6..1989b16 100644
--- a/make/matlab.mak
+++ b/make/matlab.mak
@@ -43,21 +43,7 @@ info: mex-info matlab-info
 #                                                Obtain MATLAB version
 # --------------------------------------------------------------------
 
-ifeq ($(ARCH),maci)
-MEX_SUFFIX := mexmaci
-endif
-
-ifeq ($(ARCH),maci64)
-MEX_SUFFIX := mexmaci64
-endif
-
-ifeq ($(ARCH),glnx86)
 MEX_SUFFIX := mexglx
-endif
-
-ifeq ($(ARCH),glnxa64)
-MEX_SUFFIX := mexa64
-endif
 
 MEX_BINDIR := toolbox/mex/$(MEX_SUFFIX)
 
@@ -143,56 +129,8 @@ $(if $(VERB),-v,) \
 $(if $(DEBUG),-g,-O) \
 $(if $(PROFILE),-g -O,)
 
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
-MEX_FLAGS += CC='$(CC)'
-MEX_FLAGS += LD='$(CC)'
-# a hack to support recent Xcode/clang/GCC versions on old MATLABs
-MEX_FLAGS += CFLAGS='\
--arch i386 \
--fno-common \
--fexceptions \
-$(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='\
--arch i386 \
--Wl,-syslibroot,$(SDKROOT) \
--mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) \
--bundle -Wl,-exported_symbols_list,$(MATLAB_PATH)/extern/lib/maci/mexFunction.map \
-$(if $(DISABLE_OPENMP),,-L$(MATLAB_PATH)/sys/os/$(ARCH)/) \
-$(call escape,$(STD_LDFLAGS))'
-endif
-
-# Mac OS X on Intel 64 bit processor
-ifeq ($(ARCH),maci64)
-MEX_FLAGS += -largeArrayDims
-MEX_FLAGS += CC='$(CC)'
-MEX_FLAGS += LD='$(CC)'
-MEX_FLAGS += CFLAGS='\
--arch x86_64 \
--fno-common \
--fexceptions \
-$(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='\
--arch x86_64 \
--Wl,-syslibroot,$(SDKROOT) \
--mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) \
--bundle -Wl,-exported_symbols_list,$(MATLAB_PATH)/extern/lib/maci64/mexFunction.map \
-$(if $(DISABLE_OPENMP),,-L$(MATLAB_PATH)/sys/os/$(ARCH)/) \
-$(call escape,$(STD_LDFLAGS))'
-endif
-
-# Linux on 32 bit processor
-ifeq ($(ARCH),glnx86)
-MEX_FLAGS += CFLAGS='$$CFLAGS $(call escape,$(STD_CFLAGS))'
-MEX_FLAGS += LDFLAGS='$$LDFLAGS $(call escape,$(STD_LDFLAGS))'
-endif
-
-# Linux on 64 bit processorm
-ifeq ($(ARCH),glnxa64)
-MEX_FLAGS += -largeArrayDims
 MEX_FLAGS += CFLAGS='$$CFLAGS $(call escape,$(STD_CFLAGS))'
 MEX_FLAGS += LDFLAGS='$$LDFLAGS $(call escape,$(STD_LDFLAGS))'
-endif
 
 # For efficiency reasons, immediately expand this variable once
 MEX_FLAGS := $(MEX_FLAGS)
diff --git a/make/octave.mak b/make/octave.mak
index 4939c4d..8cb42db 100644
--- a/make/octave.mak
+++ b/make/octave.mak
@@ -44,14 +44,6 @@ OCTAVE_MEX_INC    := -Itoolbox
 OCTAVE_MEX_CFLAGS = $(LINK_DLL_CFLAGS) $(OCTAVE_MEX_INC)
 OCTAVE_MEX_LDFLAGS = $(LINK_DLL_LDFLAGS) -lm
 
-# Mac OS X on Intel 32 bit processor
-ifeq ($(ARCH),maci)
-endif
-
-# Mac OS X on Intel 64 bit processor
-ifeq ($(ARCH),maci64)
-endif
-
 # --------------------------------------------------------------------
 #                                                                Build
 # --------------------------------------------------------------------