Skip to content

Commit cf3d0dd

Browse files
authored
Merge pull request #3164 from stan-dev/rtools45-arm64
Fix TBB compatibility with rtools45 on windows arm64
2 parents 0717118 + dc41494 commit cf3d0dd

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

lib/tbb_2020.3/STAN_CHANGES

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This file documents changes done for the stan-math project
1010
- Support for Windows ARM64 with RTools:
1111
- build/Makefile.tbb
1212
- L94 Wrapped the use of `--version-script` export in conditional on non-WINARM64
13-
- build/windows.gcc.ino
13+
- build/windows.gcc.inc
1414
- L84 Wrapped the use of `-flifetime-dse` flag in conditional on non-WINARM64
15+
- L101 Wrapped the use of `-msse` in conditional on non-WINARM64
1516

lib/tbb_2020.3/build/windows.gcc.inc

+5-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ CPLUS_FLAGS += -DUSE_WINTHREAD
9898
CPLUS_FLAGS += -D_WIN32_WINNT=$(_WIN32_WINNT)
9999

100100
# MinGW specific
101-
CPLUS_FLAGS += -DMINGW_HAS_SECURE_API=1 -D__MSVCRT_VERSION__=0x0700 -msse -mthreads
101+
CPLUS_FLAGS += -DMINGW_HAS_SECURE_API=1 -D__MSVCRT_VERSION__=0x0700 -mthreads
102+
# Unused under ARM64 and error with LLVM19+
103+
ifeq (, $(WINARM64))
104+
CPLUS_FLAGS += -msse
105+
endif
102106

103107
CONLY = gcc
104108
debugger = gdb

0 commit comments

Comments
 (0)