[Rcpp-commits] r446 - in pkg/src: . cxx0x

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-01-25 10:11:08 +0100 (Mon, 25 Jan 2010)
New Revision: 446

Modified:
   pkg/src/Makevars
   pkg/src/cxx0x/cxx0x.R
Log:
added some logic in the Makevars to detect c++0x, for now only based on the RCPP_CXX0X environment variable

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2010-01-25 09:06:46 UTC (rev 445)
+++ pkg/src/Makevars	2010-01-25 09:11:08 UTC (rev 446)
@@ -14,7 +14,7 @@
 ## - the environment variable RCPP_CXX0X is set to yes
 ## - it makes sense (GCC >= 4.3)
 ifeq ($(RCPP_CXX0X),yes)
-CLINK_CPPFLAGS = $(shell Rscript "cxx0x/cxx0x.R" --listen-env-var)
+CLINK_CPPFLAGS = $(shell Rscript "cxx0x/cxx0x.R")
 endif
 
 all: 	$(SHLIB) userLibrary 

Modified: pkg/src/cxx0x/cxx0x.R
===================================================================
--- pkg/src/cxx0x/cxx0x.R	2010-01-25 09:06:46 UTC (rev 445)
+++ pkg/src/cxx0x/cxx0x.R	2010-01-25 09:11:08 UTC (rev 446)
@@ -17,9 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-# This script is used by the Rcpp::RcppCxx0xFlags function to
-# generate the "-std=c++0x" flag when the compiler in use is GCC >= 4.3
-
 local({
 	flag <- function(){