Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 3756f5b

Browse filesBrowse files
kevinusheykevinushey
authored
Merge pull request #217 from andrjohns/fix-tbbmalloc-makefile
Fix tbbmalloc compilation error due to tabs
2 parents 8ace319 + 09c4898 commit 3756f5b
Copy full SHA for 3756f5b

File tree

2 files changed

+2
-2
lines changed
Filter options

2 files changed

+2
-2
lines changed

‎patches/windows_arm64.diff

Copy file name to clipboardExpand all lines: patches/windows_arm64.diff
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ index 421e95c5..e7c38fa4 100644
2727
+# LLVM on Windows doesn't need --version-script export
2828
+# https://reviews.llvm.org/D63743
2929
+ifeq (, $(WINARM64_CLANG))
30-
+ MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
30+
+ MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
3131
+endif
3232
$(MALLOC.DLL): tbbmalloc.def
3333
endif

‎src/tbb/build/Makefile.tbbmalloc

Copy file name to clipboardExpand all lines: src/tbb/build/Makefile.tbbmalloc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ tbbmalloc.def: $(MALLOC.DEF)
7777
# LLVM on Windows doesn't need --version-script export
7878
# https://reviews.llvm.org/D63743
7979
ifeq (, $(WINARM64_CLANG))
80-
MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
80+
MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
8181
endif
8282
$(MALLOC.DLL): tbbmalloc.def
8383
endif

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.