File tree Expand file tree Collapse file tree 3 files changed +26
-8
lines changed Expand file tree Collapse file tree 3 files changed +26
-8
lines changed Original file line number Diff line number Diff line change @@ -2239,12 +2239,18 @@ if test -z "${R_HOME}"; then
22392239 exit 1
22402240fi
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
22452248CXXFLAGS=` " ${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
22482254CFLAGS=` " ${R_HOME} /bin/R" CMD config CFLAGS`
22492255CPPFLAGS=` " ${R_HOME} /bin/R" CMD config CPPFLAGS`
22502256
Original file line number Diff line number Diff line change @@ -10,12 +10,18 @@ if test -z "${R_HOME}"; then
1010 exit 1
1111fi
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
1619CXXFLAGS=`"${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
1925CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
2026CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
2127
Original file line number Diff line number Diff line change @@ -15,5 +15,11 @@ shift 1
1515source /opt/miniforge/bin/activate
1616
1717set -x
18+
19+ mkdir -p ~ /.R/
20+ touch ~ /.R/Makevars
21+ echo " CXX=$CXX " >> ~ /.R/Makevars
22+ echo " CC=$CC " >> ~ /.R/Makevars
23+
1824R -e ' dir.create(Sys.getenv("R_LIBS_USER"), recursive = TRUE)'
1925python3 ops/script/test_r_package.py --build-tool=" ${build_tool} "
You can’t perform that action at this time.
0 commit comments