Skip to content

Commit 9dc5f8c

Browse files
committed
update MAKEFLAGS rather than MAKE
1 parent 7ee23f2 commit 9dc5f8c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

src/Makevars.in

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
PKG_CPPFLAGS = -I../inst/include
33
PKG_CXXFLAGS = @CXX11STD@
44

5-
override LDFLAGS = @LDFLAGS@
6-
75
ifeq ($(OS), Windows_NT)
86

97
USE_TBB=Windows
108
TBB_COPY_PATTERN=tbb*.dll
119

12-
MAKEFLAGS = -j1
13-
MAKE = make -e -s
10+
MAKE = make
11+
MAKEFLAGS = -e -s -j1
1412
MAKE_CMD = \
1513
CYGWIN=nodosfilewarning \
1614
CONLY="@WINDOWS_CC@" \
@@ -37,7 +35,7 @@ else
3735
endif
3836
endif
3937

40-
MAKE += -e -s
38+
MAKEFLAGS += -e -s
4139
MAKE_CMD = \
4240
CONLY="@CC@ $(PKG_CPPFLAGS) @CPPFLAGS@" \
4341
CPLUS="@CXX11@ $(PKG_CPPFLAGS) @CPPFLAGS@" \

tools/config/configure.R

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ if (Sys.info()[["sysname"]] == "Windows") {
7575

7676
}
7777

78-
# override LDFLAGS (disable LTO on OpenSUSE)
79-
ldflags <- read_r_config("LDFLAGS", envir = NULL)[[1]]
80-
ldflags <- gsub("-flto=auto", "", ldflags, fixed = TRUE)
81-
define(LDFLAGS = ldflags)
82-
8378
# use c++0x for compatibility with older compilers
8479
define(STDVER = "c++0x")
8580

0 commit comments

Comments
 (0)