@@ -705,9 +705,11 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
705
705
706
706
# Check version
707
707
ver <- key $ `Current Version`
708
- if (ver %in% (c(" 2.15" , " 2.16" , " 3.0" , " 3.1" , " 3.2" , " 3.3" ))) {
708
+ if (ver %in% (c(" 2.15" , " 2.16" , " 3.0" , " 3.1" , " 3.2" , " 3.3" , " 3.4 " ))) {
709
709
# See if the InstallPath leads to the expected directories
710
- isGcc49 <- FALSE
710
+ # R version 3.3.0 alpha (2016-03-25 r70378)
711
+ isGcc49 <- ver %in% c(" 3.3" , " 3.4" ) && as.numeric(R.Version()$ `svn rev` ) > = 70378
712
+
711
713
rToolsPath <- key $ `InstallPath`
712
714
if (! is.null(rToolsPath )) {
713
715
# add appropriate path entries
@@ -721,8 +723,10 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
721
723
env <- list ()
722
724
path <- paste(path , collapse = .Platform $ path.sep )
723
725
env $ PATH <- paste(path , Sys.getenv(" PATH" ), sep = .Platform $ path.sep )
724
- if (isGcc49 )
725
- env $ RTOOLS <- .rtoolsPath(rToolsPath )
726
+ if (isGcc49 ) {
727
+ env $ RTOOLS <- .rtoolsPath(rToolsPath )
728
+ env $ BINPREF <- file.path(env $ RTOOLS , " mingw_$(WIN)/bin//" , fsep = " /" )
729
+ }
726
730
return (env )
727
731
}
728
732
}
0 commit comments