Skip to content

Commit

Permalink
Remove -arch options from Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
ridiculousfish committed Apr 2, 2016
1 parent ed3a707 commit f138fd8
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions Makefile
@@ -1,15 +1,10 @@
UNAME := $(shell uname)

ifeq ($(UNAME),Darwin)
# Mac OS X
ARCH_386 = -arch i386
ARCH_x64 = -arch x86_64
CC = clang
LINKFLAGS =
else
# Just build natively on Linux et. al.
ARCH_386 =
ARCH_x64 =
CC = cc
LINKFLAGS = -lpthread
endif
Expand All @@ -25,19 +20,19 @@ test: release
tester: debug

debug: libdivide_test.cpp libdivide.h
$(CPP) $(DEBUG_FLAGS) $(ARCH_386) $(ARCH_x64) -g -o tester libdivide_test.cpp $(LINKFLAGS)
$(CPP) $(DEBUG_FLAGS) -g -o tester libdivide_test.cpp $(LINKFLAGS)

i386: libdivide_test.cpp libdivide.h
$(CPP) $(DEBUG_FLAGS) $(ARCH_386) -o tester libdivide_test.cpp $(LINKFLAGS)
$(CPP) $(DEBUG_FLAGS) -o tester libdivide_test.cpp $(LINKFLAGS)

x86_64: libdivide_test.cpp libdivide.h
$(CPP) $(DEBUG_FLAGS) $(ARCH_x64) -o tester libdivide_test.cpp $(LINKFLAGS)

release: libdivide_test.cpp libdivide.h
$(CPP) $(RELEASE_FLAGS) $(ARCH_x64) $(ARCH_386) -o tester libdivide_test.cpp $(LINKFLAGS)
$(CPP) $(RELEASE_FLAGS) -o tester libdivide_test.cpp $(LINKFLAGS)

benchmark: libdivide_benchmark.c libdivide.h
$(CC) $(RELEASE_FLAGS) $(ARCH_x64) $(ARCH_386) -o benchmark libdivide_benchmark.c $(LINKFLAGS)
$(CC) $(RELEASE_FLAGS) $(ARCH_x64) -o benchmark libdivide_benchmark.c $(LINKFLAGS)

primes: primes_benchmark.cpp libdivide.h
$(CPP) -O3 -std=c++14 primes_benchmark.cpp -o $@
Expand Down

0 comments on commit f138fd8

Please sign in to comment.