--- Makefile.orig	2016-04-01 10:04:37.000000000 -0400
+++ Makefile	2016-04-01 10:04:17.000000000 -0400
@@ -34,26 +34,8 @@
 BOWTIE_MM = 1
 BOWTIE_SHARED_MEM = 0
 
-# Detect Cygwin or MinGW
-WINDOWS = 0
-MINGW = 0
-ifneq (,$(findstring MINGW,$(shell uname)))
-	WINDOWS = 1
-	MINGW = 1
-	# POSIX memory-mapped files not currently supported on Windows
-	BOWTIE_MM = 0
-	BOWTIE_SHARED_MEM = 0
-endif
-
-MACOS = 0
-ifneq (,$(findstring Darwin,$(shell uname)))
-	MACOS = 1
-	ifneq (,$(findstring 13,$(shell uname -r)))
-		CPP = clang++
-		CC = clang
-		override EXTRA_FLAGS += -stdlib=libstdc++
-	endif
-endif
+MACOS = 1
+override EXTRA_FLAGS += -stdlib=libstdc++
 
 POPCNT_CAPABILITY ?= 1
 ifeq (1, $(POPCNT_CAPABILITY))