Skip to content
Browse files

correct OPENMP checks

git-svn-id: https://svn.r-project.org/R/trunk@62392 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent dc6aefc commit 872f61b8cd7a211f20393ce3fd8d130c94b6db94 ripley committed
Showing with 268 additions and 360 deletions.
  1. +263 −355 configure
  2. +5 −5 configure.ac
View
618 configure
263 additions, 355 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
10 configure.ac
@@ -1739,8 +1739,8 @@ AC_SUBST(FW_VERSION)
##
## (The Fortran 77 compiler is never used for linking by default.)
-if test "x${main_ld_was_given}" = xno -a "${MAIN_LD}" = "${CC}" -a \
- "x${dylib_ld_was_given}" = xno -a "${DYLIB_LD}" = "${CC}" -a \
+if test "x${main_ld_was_given}" = xno -a "${MAIN_LD}" = "\$(CC)" -a \
+ "x${dylib_ld_was_given}" = xno -a "${DYLIB_LD}" = "\$(CC)" -a \
"x${ac_cv_prog_c_openmp}" != "xunsupported" -a \
"x${ac_cv_prog_c_openmp}" != "x"; then
R_OPENMP_CFLAGS="${OPENMP_CFLAGS}"
@@ -2334,14 +2334,14 @@ AC_SUBST(FCLIBS)
## OpenMP package stuff (needs to come *after* configuration of all
## compilers).
if test "x${shlib_ld_was_given}" = xno -a \
- "${SHLIB_LD}" = "${CC}" -a \
+ "${SHLIB_LD}" = "\$(CC)" -a \
"x${ac_cv_prog_c_openmp}" != "xunsupported" -a \
"x${ac_cv_prog_c_openmp}" != "x" -a \
"x${shlib_cxxld_was_given}" = xno -a \
- "${SHLIB_CXXLD}" = "${CXX}" -a \
+ "${SHLIB_CXXLD}" = "\$(CXX)" -a \
"x${ac_cv_prog_cxx_openmp}" != "xunsupported" -a \
"x${shlib_fcld_was_given}" = xno -a \
- "${SHLIB_FCLD}" = "${FC}" -a \
+ "${SHLIB_FCLD}" = "\$(FC)" -a \
"x${ac_cv_prog_fc_openmp}" != "xunsupported"; then
SHLIB_OPENMP_CFLAGS="${OPENMP_CFLAGS}"
SHLIB_OPENMP_CXXFLAGS="${OPENMP_CXXFLAGS}"

0 comments on commit 872f61b

Please sign in to comment.
Something went wrong with that request. Please try again.