Skip to content

Commit 30c5b58

Browse files
committed
support older R on Windows
1 parent 2aea71c commit 30c5b58

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/Makevars.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifeq ($(OS), Windows_NT)
1010

1111
MAKEFLAGS = -j1
1212
MAKE = make -e
13-
MAKE_CMD = CONLY="@CC@" CPLUS="@CXX11@" PIC_KEY="@CXX11PICFLAGS@" WARNING_SUPPRESS="" $(MAKE)
13+
MAKE_CMD = CYGWIN=nodosfilewarning CONLY="@CC@" CPLUS="@CXX11@" PIC_KEY="@CXX11PICFLAGS@" WARNING_SUPPRESS="" $(MAKE)
1414

1515
else
1616

tools/config/configure.R

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
if (getRversion() < "3.4.0") {
1+
if (Sys.info()[["sysname"]] == "Windows" && getRversion() < "3.1.0") {
2+
define(
3+
CC = "$(CC)",
4+
CXX11 = "$(CXX)",
5+
CXX11STD = "-std=c++0x",
6+
CXX11PICFLAGS = "-fPIC"
7+
)
8+
} else if (getRversion() < "3.4.0") {
29
define(
310
CC = "$(CC)",
411
CXX11 = "$(CXX1X)",
@@ -14,4 +21,5 @@ if (getRversion() < "3.4.0") {
1421
)
1522
}
1623

17-
define(STDVER = "c++11")
24+
# use c++0x for compatibility with older compilers
25+
define(STDVER = "c++0x")

0 commit comments

Comments
 (0)