Merge branch 'master' into scanopt-win

zeux · Jun 11, 2024 · 3f70b29 · 3f70b29
2 parents 47ee63e + 34fa54c
commit 3f70b29
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ BUILD=build/make-$(CXX)
 
 CCFLAGS=-c -g -Wall -Werror -fPIC -O2 -Iextern/lz4/lib -Iextern/re2
 CXXFLAGS=-std=c++11
-LDFLAGS=-lpthread -lstdc++
+LDFLAGS=-lpthread
 
 ifeq ($(shell uname -p),x86_64)
 CCFLAGS+=-msse2 -DUSE_SSE2
@@ -16,8 +16,9 @@ CCFLAGS+=-DUSE_NEON
 endif
 
 ifeq ($(shell uname),Darwin)
-CCFLAGS+=-force_cpusubtype_ALL -mmacosx-version-min=10.7 -stdlib=libc++
-LDFLAGS+=-force_cpusubtype_ALL -mmacosx-version-min=10.7 -stdlib=libc++
+CCFLAGS+=-force_cpusubtype_ALL -mmacosx-version-min=10.7
+CXXFLAGS+=-stdlib=libc++
+LDFLAGS+=-mmacosx-version-min=10.7
 LDFLAGS+=-framework CoreFoundation -framework CoreServices
 else
 LDFLAGS+=-pie -Wl,--dynamic-list=src/qgrep.dynlist