Author: Michael R. Crusoe <crusoe@debian.org>
Description: Handle -m64 and -msse2 flags better
Forwarded: not-needed
Index: bowtie2/Makefile
===================================================================
--- bowtie2.orig/Makefile
+++ bowtie2/Makefile
@@ -77,10 +77,9 @@ endif
 # do we have a 256-bit variant of the executable?
 ENABLE_V256 := 0
 
-BITS := 32
-ARCH ?= $(shell uname -m)
-ifneq (,$(findstring $(ARCH), x86_64 amd64))
-  BITS := 64
+CXXFLAGS += -fopenmp-simd
+CPPFLAGS += -Ithird_party
+ifneq (,$(findstring $(shell dpkg-architecture -q DEB_TARGET_ARCH), x86_64 amd64))
   SSE_FLAG := -msse2
   POPCNT_CAPABILITY ?= 1
   ifneq (0, $(SSE_AVX2))
@@ -89,11 +88,8 @@ ifneq (,$(findstring $(ARCH), x86_64 amd
     # tell 128-bit version to check for v256 capability and use it, if found
     SSE_FLAG += -DENABLE_x86_64_v3
   endif
-else ifneq (,$(findstring $(ARCH), aarch64 arm64 s390x powerpc64 powerpc64le ppc64 ppc64le))
-  BITS := 64
+else
   SSE_FLAG :=
-  CXXFLAGS += -fopenmp-simd
-  CPPFLAGS += -Ithird_party
   POPCNT_CAPABILITY ?= 0
 endif
 
