--- Makefile.orig	2017-10-16 23:18:47 UTC
+++ Makefile
@@ -19,7 +19,7 @@ BUILD_IBIN = build/obj/bin
 
 DOXYGEN ?= doxygen
 
-ifeq ($(UNAME),Darwin)
+ifeq ($(UNAME),FreeBSD)
 CC = clang
 CXX = clang++
 else
@@ -49,8 +49,6 @@ endif
 
 TODAY = $(shell date "+%Y-%m-%d")
 
-ARCHFLAGS ?= -march=native
-
 ifeq ($(CC),clang)
 WARNFLAGS_C += -Wgcc-compat
 endif
@@ -97,14 +95,14 @@ scan: clean
 
 # Internal test programs, which are not part of the final build/bin directory.
 $(BUILD_IBIN)/test: $(BUILD_OBJ)/test_decaf.o lib
-ifeq ($(UNAME),Darwin)
+ifeq ($(UNAME),FreeBSD)
 	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
 else
 	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf
 endif
 
 $(BUILD_BIN)/ristretto: $(BUILD_OBJ)/ristretto.o lib
-ifeq ($(UNAME),Darwin)
+ifeq ($(UNAME),FreeBSD)
 	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
 else
 	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf
@@ -112,14 +110,14 @@ endif
 
 # Internal test programs, which are not part of the final build/bin directory.
 $(BUILD_IBIN)/test_ct: $(BUILD_OBJ)/test_ct.o lib
-ifeq ($(UNAME),Darwin)
+ifeq ($(UNAME),FreeBSD)
 	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
 else
 	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf
 endif
 
 $(BUILD_IBIN)/bench: $(BUILD_OBJ)/bench_decaf.o lib
-ifeq ($(UNAME),Darwin)
+ifeq ($(UNAME),FreeBSD)
 	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
 else
 	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf
