Skip to content

Commit

Permalink
Merge pull request #217 from andrjohns/fix-tbbmalloc-makefile
Browse files Browse the repository at this point in the history
Fix tbbmalloc compilation error due to tabs
  • Loading branch information
kevinushey authored May 23, 2024
2 parents 8ace319 + 09c4898 commit 3756f5b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion patches/windows_arm64.diff
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ index 421e95c5..e7c38fa4 100644
+# LLVM on Windows doesn't need --version-script export
+# https://reviews.llvm.org/D63743
+ifeq (, $(WINARM64_CLANG))
+ MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
+ MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
+endif
$(MALLOC.DLL): tbbmalloc.def
endif
Expand Down
2 changes: 1 addition & 1 deletion src/tbb/build/Makefile.tbbmalloc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ tbbmalloc.def: $(MALLOC.DEF)
# LLVM on Windows doesn't need --version-script export
# https://reviews.llvm.org/D63743
ifeq (, $(WINARM64_CLANG))
MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
endif
$(MALLOC.DLL): tbbmalloc.def
endif
Expand Down

0 comments on commit 3756f5b

Please sign in to comment.