diff options
| author | Bartosz Taudul <wolf.pld@gmail.com> | 2020-06-19 03:06:56 +0300 |
|---|---|---|
| committer | Bartosz Taudul <wolf.pld@gmail.com> | 2020-06-19 03:17:10 +0300 |
| commit | b4d6833231fea194f2d2912d29c8f2ca452f7178 (patch) | |
| tree | f1128f6ffda11e80147d1819ffe5a20758705329 /import-chrome | |
| parent | 11e1671048021dff3148718003d9681b5e005382 (diff) | |
Use pkg-config to link with TBB, but silence errors.
Diffstat (limited to 'import-chrome')
| -rw-r--r-- | import-chrome/build/unix/build.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/import-chrome/build/unix/build.mk b/import-chrome/build/unix/build.mk index fcd1f6b0..0b32889d 100644 --- a/import-chrome/build/unix/build.mk +++ b/import-chrome/build/unix/build.mk @@ -1,8 +1,8 @@ CFLAGS += CXXFLAGS := $(CFLAGS) -std=gnu++17 DEFINES += -DTRACY_NO_STATISTICS -INCLUDES := $(shell pkg-config --cflags capstone) -LIBS := $(shell pkg-config --libs capstone) -lpthread +INCLUDES := $(shell pkg-config --cflags capstone) $(shell pkg-config --silence-errors --cflags tbb) +LIBS := $(shell pkg-config --libs capstone) $(shell pkg-config --silence-errors --libs tbb) -lpthread PROJECT := import-chrome IMAGE := $(PROJECT)-$(BUILD) @@ -14,11 +14,6 @@ BASE2 := $(shell egrep 'ClCompile.*c"' ../win32/$(PROJECT).vcxproj | sed -e 's/. SRC := $(filter-out $(FILTER),$(BASE)) SRC2 := $(filter-out $(FILTER),$(BASE2)) -TBB := $(shell ld -ltbb -o /dev/null 2>/dev/null; echo $$?) -ifeq ($(TBB),0) - LIBS += -ltbb -endif - OBJDIRBASE := obj/$(BUILD) OBJDIR := $(OBJDIRBASE)/o/o/o |