Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ ifeq ($(OS),Windows_NT)
PLATFORM_OPTS = -static
TBB_PLATFORM_OPTS = -DUSE_WINTHREAD
else
LD_PLATFORM_OPTS = -lrt
UNAME_S := $(shell uname -s)
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use $(OS)?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately doesn't work on OSX at least. I based this design off of this pattern:

https://stackoverflow.com/questions/714100/os-detecting-makefile

ifeq ($(UNAME_S),Linux)
LD_PLATFORM_OPTS = -lrt
endif
# -fsanitize=address seems to have a slow memory leak when creating/destroying a lot of threads
#DEBUG_OPTS += -fno-omit-frame-pointer -fsanitize=address
endif
Expand Down