[Rcpp-commits] r2525 - pkg/RcppArmadillo/src

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Thu Nov 25 17:07:39 CET 2010


Author: edd
Date: 2010-11-25 17:07:39 +0100 (Thu, 25 Nov 2010)
New Revision: 2525

Modified:
   pkg/RcppArmadillo/src/Makevars.win
Log:
make Makevars.win arch-dependent


Modified: pkg/RcppArmadillo/src/Makevars.win
===================================================================
--- pkg/RcppArmadillo/src/Makevars.win	2010-11-25 14:52:26 UTC (rev 2524)
+++ pkg/RcppArmadillo/src/Makevars.win	2010-11-25 16:07:39 UTC (rev 2525)
@@ -1,6 +1,6 @@
 ## This assumes that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e 'Rcpp:::LdFlags()')
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 
 PKG_CPPFLAGS = -I../inst/include -I.
 PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)



More information about the Rcpp-commits mailing list