diff --git a/R-package/src/Makevars b/R-package/src/Makevars index 7dfda4d57..969571290 100644 --- a/R-package/src/Makevars +++ b/R-package/src/Makevars @@ -2,11 +2,10 @@ PKGROOT=../../ # _*_ mode: Makefile; _*_ CXX=`R CMD config CXX` -CFLAGS=`R CMD config CFLAGS` +TCFLAGS=`R CMD config CFLAGS` # expose these flags to R CMD SHLIB PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_ERROR_ -I$(PKGROOT) $(SHLIB_OPENMP_CFLAGS) -XGBFLAG= $(CFLAGS) -DXGBOOST_CUSTOMIZE_ERROR_ -fPIC $(SHLIB_OPENMP_CFLAGS) - +XGBFLAG= $(TCFLAGS) -DXGBOOST_CUSTOMIZE_ERROR_ -fPIC $(SHLIB_OPENMP_CFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) ifeq ($(no_omp),1) @@ -25,7 +24,7 @@ xgboost_io.o: $(PKGROOT)/src/io/io.cpp xgboost_gbm.o: $(PKGROOT)/src/gbm/gbm.cpp xgboost_updater.o: $(PKGROOT)/src/tree/updater.cpp -$(CXXOBJ) : +$(CXXOBJ) : $(CXX) -c $(XGBFLAG) -o $@ $(firstword $(filter %.cpp %.c, $^) ) clean: diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win index 3df9891fc..3015a1982 100644 --- a/R-package/src/Makevars.win +++ b/R-package/src/Makevars.win @@ -2,10 +2,10 @@ PKGROOT=../../ # _*_ mode: Makefile; _*_ CXX=`Rcmd config CXX` -CFLAGS=`Rcmd config CFLAGS` +TCFLAGS=`Rcmd config CFLAGS` # expose these flags to R CMD SHLIB PKG_CPPFLAGS= -DXGBOOST_CUSTOMIZE_ERROR_ -I$(PKGROOT) $(SHLIB_OPENMP_CFLAGS) -XGBFLAG= $(CFLAGS) -DXGBOOST_CUSTOMIZE_ERROR_ -fPIC $(SHLIB_OPENMP_CFLAGS) +XGBFLAG= $(TCFLAGS) -DXGBOOST_CUSTOMIZE_ERROR_ -fPIC $(SHLIB_OPENMP_CFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) ifeq ($(no_omp),1)