Skip to content

Commit cae9be6

Browse files
committed
Deduplicate OpenMP substitution in Makevars
1 parent 70cb593 commit cae9be6

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

configure

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ check_openmp_flags () {
9191
}
9292

9393
detect_openmp () {
94+
R_OPENMP_CFLAGS=
95+
R_OPENMP_LIBS=
96+
9497
check_openmp_flags "R installation is configured to use OpenMP" '$(SHLIB_OPENMP_CFLAGS)' '$(SHLIB_OPENMP_CFLAGS)' && return
9598

9699
# https://github.com/Rdatatable/data.table/issues/6409
@@ -129,10 +132,8 @@ if [ "${R_OPENMP_ENABLED}" = "0" ]; then
129132
echo "*** https://github.com/Rdatatable/data.table/wiki/Installation"
130133
echo "*** Continuing installation without OpenMP support..."
131134
echo "***"
132-
sed -e "s|@openmp_cflags@||" -e "s|@openmp_libs@||" src/Makevars.in > src/Makevars
133-
else
134-
sed -e "s|@openmp_cflags@|${R_OPENMP_CFLAGS}|" -e "s|@openmp_libs@|${R_OPENMP_LIBS}|" src/Makevars.in > src/Makevars
135135
fi
136+
sed -e "s|@openmp_cflags@|${R_OPENMP_CFLAGS}|" -e "s|@openmp_libs@|${R_OPENMP_LIBS}|" src/Makevars.in > src/Makevars
136137

137138
# retain user supplied PKG_ env variables, #4664. See comments in Makevars.in too.
138139
sed -e "s|@PKG_CFLAGS@|$PKG_CFLAGS|" src/Makevars > src/Makevars.tmp && mv src/Makevars.tmp src/Makevars

0 commit comments

Comments
 (0)