Skip to content

Commit 65f3d8d

Browse files
committed
more Windows fun
1 parent 0950041 commit 65f3d8d

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

tools/config/configure.R

+9
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,15 @@ pkgLibs <- if (!is.na(tbbLib)) {
247247

248248
}
249249

250+
# on Windows, we may need to link to ssp; otherwise,
251+
# we see errors like
252+
#
253+
# C:\rtools43\x86_64-w64-mingw32.static.posix\bin/ld.exe: C:/rtools43/x86_64-w64-mingw32.static.posix/lib/libtbb12.a(allocator.cpp.obj):allocator.cpp:(.text+0x18b): undefined reference to `__stack_chk_fail'
254+
#
255+
if (.Platform$OS.type == "windows") {
256+
pkgLibs <- c(pkgLibs, "-lssp")
257+
}
258+
250259
define(PKG_LIBS = paste(pkgLibs, collapse = " "))
251260

252261
# if we're going to build tbb from sources, check for cmake

0 commit comments

Comments
 (0)