Skip to content

Commit 456236f

Browse files
committed
update c++ linking strategy
1 parent 738bef2 commit 456236f

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

R/watcher-package.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
#' @keywords internal
55
"_PACKAGE"
66

7-
# To silence R CMD check note: All declared Imports should be used.
7+
# Silences R CMD check note: All declared Imports should be used
88
# rlang is not loaded unless used, later is loaded but used only at C level
9+
# nocov start
910
.internal <- function() {
1011
if (FALSE) later::run_now(rlang::as_function(identity))
1112
}
13+
# nocov end

src/Makevars.ucrt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
PKG_CFLAGS=-I../install/include $(C_VISIBILITY)
2-
PKG_LIBS=-L../install/lib -lfswatch -lstdc++ -static-libgcc -static-libstdc++ -pthread
2+
PKG_LIBS=-L../install/lib -lfswatch -pthread

src/Makevars.win

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
PKG_CFLAGS=-I../install/include $(C_VISIBILITY)
2-
PKG_LIBS=-L../install/lib -Wl,-Bstatic -lfswatch -lstdc++ -lstdc++fs -pthread -Wl,-Bdynamic
2+
PKG_LIBS=-L../install/lib -lfswatch -pthread -lstdc++fs

src/link.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* this empty .cpp file in /src triggers R to link against C++ */

0 commit comments

Comments
 (0)