Skip to content

Commit b47928d

Browse files
authored
Merge pull request #3060 from stan-dev/rtools44-gha
2 parents 35d37ce + 6ee370a commit b47928d

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

.github/workflows/main.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Windows Rtools40
1+
name: Windows Rtools44
22

33
on:
44
pull_request:
@@ -30,16 +30,16 @@ jobs:
3030
python-version: '3.x'
3131
- uses: r-lib/actions/setup-r@v2
3232
with:
33-
r-version: 4.1.3
33+
r-version: 'release'
34+
rtools-version: '44'
3435

35-
- name: Set path for Rtools40
36+
- name: Set path for Rtools44
3637
if: runner.os == 'Windows'
37-
run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
38+
run: echo "C:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
3839

3940
- name: Build Math libs
4041
shell: powershell
4142
run: |
42-
Add-Content make\local "O=1`n"
4343
make -f make/standalone math-libs -j2
4444
- name: Add TBB to PATH
4545
shell: powershell
@@ -71,16 +71,16 @@ jobs:
7171
python-version: '3.x'
7272
- uses: r-lib/actions/setup-r@v2
7373
with:
74-
r-version: 4.1.3
74+
r-version: 'release'
75+
rtools-version: '44'
7576

76-
- name: Set path for Rtools40
77+
- name: Set path for Rtools44
7778
if: runner.os == 'Windows'
78-
run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
79+
run: echo "C:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
7980

8081
- name: Build Math libs
8182
shell: powershell
8283
run: |
83-
Add-Content make\local "O=1`n"
8484
make -f make/standalone math-libs -j2
8585
- name: Add TBB to PATH
8686
shell: powershell
@@ -116,16 +116,16 @@ jobs:
116116
python-version: '3.x'
117117
- uses: r-lib/actions/setup-r@v2
118118
with:
119-
r-version: 4.1.3
119+
r-version: 'release'
120+
rtools-version: '44'
120121

121-
- name: Set path for Rtools40
122+
- name: Set path for Rtools44
122123
if: runner.os == 'Windows'
123-
run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
124+
run: echo "C:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
124125

125126
- name: Build Math libs
126127
shell: powershell
127128
run: |
128-
Add-Content make\local "O=1`n"
129129
make -f make/standalone math-libs -j2
130130
- name: Add TBB to PATH
131131
shell: powershell
@@ -156,11 +156,12 @@ jobs:
156156
python-version: '3.x'
157157
- uses: r-lib/actions/setup-r@v2
158158
with:
159-
r-version: 4.1.3
159+
r-version: 'release'
160+
rtools-version: '44'
160161

161-
- name: Set path for Rtools40
162+
- name: Set path for Rtools44
162163
if: runner.os == 'Windows'
163-
run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
164+
run: echo "C:/rtools44/usr/bin;C:/rtools44/x86_64-w64-mingw32.static.posix/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
164165

165166
- name: Build Math libs
166167
shell: powershell

make/compiler_flags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ ifeq ($(OS),Windows_NT)
161161
CXXFLAGS_WARNINGS ?= -Wall -Wno-unused-function -Wno-uninitialized -Wno-unused-but-set-variable -Wno-unused-variable -Wno-sign-compare -Wno-unused-local-typedefs -Wno-int-in-bool-context -Wno-attributes
162162
CPPFLAGS_GTEST ?= -DGTEST_HAS_PTHREAD=0
163163
CPPFLAGS_OS ?= -D_USE_MATH_DEFINES
164+
CPPFLAGS_OS += -D_GLIBCXX11_USE_C99_COMPLEX
164165
## Detecting Process Bitness:
165166
## http://blogs.msdn.com/b/david.wang/archive/2006/03/26/howto-detect-process-bitness.aspx
166167
ifeq ($(PROCESSOR_ARCHITECTURE)$(PROCESSOR_ARCHITEW6432),x86)

0 commit comments

Comments
 (0)