Skip to content

Commit 58401ce

Browse files
Update makefile
1 parent 490fd6c commit 58401ce

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

makefile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ endif
1414
ifeq ($(uname_S),Linux)
1515
# check if CPU supports AVX2
1616
HAVE_AVX2=$(filter-out 0,$(shell grep avx2 /proc/cpuinfo | wc -l))
17+
OMP_FLAGS = -fopenmp
18+
ABI_FLAGS = -fabi-version=6
1719
endif
1820
ifeq ($(uname_S),Darwin)
1921
# check if CPU supports SSE4.2
2022
HAVE_AVX2=$(filter-out 0,$(shell sysctl machdep.cpu.features| grep AVX2 - | wc -l))
23+
OMP_FLAGS = -Xpreprocessor -fopenmp
24+
ABI_FLAGS =
2125
endif
2226

23-
2427
## ###################
2528
KMER_DB_ROOT_DIR = .
2629
KMER_DB_MAIN_DIR = src
@@ -32,15 +35,6 @@ else
3235
EXTRA_LIBS_DIR = ""
3336
endif
3437

35-
OS_NAME := $(shell uname -s)
36-
ifeq ($(OS_NAME), Darwin)
37-
OMP_FLAGS = -Xpreprocessor -fopenmp
38-
ABI_FLAGS =
39-
else
40-
OMP_FLAGS = -fopenmp
41-
ABI_FLAGS = -fabi-version=6
42-
endif
43-
4438

4539
CC = g++
4640
LDFLAGS +=
@@ -49,6 +43,7 @@ CFLAGS_AVX2 += $(CFLAGS) -mavx2 -I $(KMER_DB_LIBS_DIR) -I $(EXTRA_LIBS_DIR)
4943
CFLAGS += -mavx -I $(KMER_DB_LIBS_DIR) -I $(EXTRA_LIBS_DIR)
5044
CLINK = -lm -O3 -std=c++11 -lpthread $(OMP_FLAGS) -mavx $(ABI_FLAGS) -lz
5145

46+
5247
OBJS := $(KMER_DB_MAIN_DIR)/analyzer.o \
5348
$(KMER_DB_MAIN_DIR)/console.o \
5449
$(KMER_DB_MAIN_DIR)/instrset_detect.o \

0 commit comments

Comments
 (0)