Skip to content

Commit

Permalink
Try to fix arm build
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Sep 26, 2023
1 parent 24815e3 commit 1d3fec3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ jobs:
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'devel'}
- {os: windows-latest, r: 'release'}
- {os: windows-latest, r: '4.2'}
- {os: windows-latest, r: '4.1'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
Expand All @@ -27,7 +30,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
3 changes: 0 additions & 3 deletions src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ LIBUNRTF = \

UNRTF = unrtf$(WIN)

# On Windows we need to link Riconv and winsock
WINFLAGS = $(subst 64,-lws2_32 $(LIBR) -lRiconv,$(subst 32,64,$(WIN)))

# Workaround for MacOS R 4.0 harding pcre2
SYSLIBS = $(subst -lpcre2-8,,$(LIBS))

Expand Down
2 changes: 2 additions & 0 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
WINFLAGS = -lws2_32 $(LIBR) -lRiconv
include Makevars

0 comments on commit 1d3fec3

Please sign in to comment.