Skip to content

Commit 7a26fae

Browse files
committed
Revert to use of gcc 4.6.3 with Rtools 3.3
1 parent fbe3f86 commit 7a26fae

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2015-03-18 JJ Allaire <[email protected]>
2+
3+
* R/Attributes.R: Revert to use of gcc 4.6.3 with Rtools 3.3
4+
15
2015-03-16 JJ Allaire <[email protected]>
26

37
* src/attributes.cpp: Fix failing local include test (normalize path of

R/Attributes.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
696696
ver <- key$`Current Version`
697697
if (ver %in% (c("2.15", "2.16", "3.0", "3.1", "3.2", "3.3"))) {
698698
# See if the InstallPath leads to the expected directories
699-
isGcc49 <- ver %in% c("3.3")
699+
isGcc49 <- FALSE
700700
rToolsPath <- key$`InstallPath`
701701
if (!is.null(rToolsPath)) {
702702
# add appropriate path entries

inst/NEWS.Rd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
\itemize{
77
\item Changes in Rcpp Attributes:
88
\itemize{
9-
\item Rtools 3.3 is now located and used for compilation under
10-
R 3.2.
9+
\item Rtools 3.3 is now supported.
1110
}
1211
}
1312
}

0 commit comments

Comments
 (0)