Skip to content

Commit 28f51be

Browse files
committed
Honor CXX / CC flags when testing R
1 parent 5c01d76 commit 28f51be

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

R-package/configure

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,12 +2239,18 @@ if test -z "${R_HOME}"; then
22392239
exit 1
22402240
fi
22412241

2242-
CXX17=`"${R_HOME}/bin/R" CMD config CXX17`
2243-
CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD`
2244-
CXX="${CXX17} ${CXX17STD}"
2242+
if [ -z "${CXX:-}" ]
2243+
then
2244+
CXX17=`"${R_HOME}/bin/R" CMD config CXX17`
2245+
CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD`
2246+
CXX="${CXX17} ${CXX17STD}"
2247+
fi
22452248
CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
22462249

2247-
CC=`"${R_HOME}/bin/R" CMD config CC`
2250+
if [ -z "${CC:-}" ]
2251+
then
2252+
CC=`"${R_HOME}/bin/R" CMD config CC`
2253+
fi
22482254
CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
22492255
CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
22502256

R-package/configure.ac

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,18 @@ if test -z "${R_HOME}"; then
1010
exit 1
1111
fi
1212

13-
CXX17=`"${R_HOME}/bin/R" CMD config CXX17`
14-
CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD`
15-
CXX="${CXX17} ${CXX17STD}"
13+
if [[ -z "${CXX:-}" ]]
14+
then
15+
CXX17=`"${R_HOME}/bin/R" CMD config CXX17`
16+
CXX17STD=`"${R_HOME}/bin/R" CMD config CXX17STD`
17+
CXX="${CXX17} ${CXX17STD}"
18+
fi
1619
CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
1720

18-
CC=`"${R_HOME}/bin/R" CMD config CC`
21+
if [[ -z "${CC:-}" ]]
22+
then
23+
CC=`"${R_HOME}/bin/R" CMD config CC`
24+
fi
1925
CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
2026
CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
2127

ops/pipeline/test-rpkg-impl.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,11 @@ shift 1
1515
source /opt/miniforge/bin/activate
1616

1717
set -x
18+
19+
mkdir -p ~/.R/
20+
touch ~/.R/Makevars
21+
echo "CXX=$CXX" >> ~/.R/Makevars
22+
echo "CC=$CC" >> ~/.R/Makevars
23+
1824
R -e 'dir.create(Sys.getenv("R_LIBS_USER"), recursive = TRUE)'
1925
python3 ops/script/test_r_package.py --build-tool="${build_tool}"

0 commit comments

Comments
 (0)