Skip to content

Commit 548751c

Browse files
tnaglertnagler
and
tnagler
authored
fix flags for sourceCpp (#68)
* fix flags for sourceCpp * update actions workflow --------- Co-authored-by: tnagler <[email protected]>
1 parent 376c3b1 commit 548751c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/R-CMD-check.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v2
3434

35-
- uses: r-lib/actions/setup-r@master
35+
- uses: r-lib/actions/setup-r@v2
3636
with:
3737
r-version: ${{ matrix.config.r }}
3838
http-user-agent: ${{ matrix.config.http-user-agent }}
3939

40-
- uses: r-lib/actions/setup-pandoc@master
40+
- uses: r-lib/actions/setup-pandoc@v2
4141

4242
- name: Query dependencies
4343
run: |

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Encoding: UTF-8
1313
SystemRequirements: C++11
1414
URL: https://github.com/tnagler/RcppThread
1515
BugReports: https://github.com/tnagler/RcppThread/issues
16-
RoxygenNote: 7.1.2
16+
RoxygenNote: 7.2.0
1717
Suggests:
1818
testthat,
1919
R.rsp,

R/inline.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ inlineCxxPlugin <- function(...) {
22
settings <- Rcpp::Rcpp.plugin.maker(
33
include.before = "#include <RcppThread.h>",
44
package = "RcppThread",
5-
libs = if (Sys.info()["sysname"] == "Linux") "-latomic -lpthread" else ""
5+
libs = RcppThread::LdFlags()
66
)()
77
settings$env$USE_CXX11 <- "yes"
88
settings

0 commit comments

Comments
 (0)