From 5e60224426f99a1a58fa85f279d5e3fad01e1b09 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 21 Aug 2019 12:10:48 -0500 Subject: [PATCH] fixed compiler check regex in install.libs.R (#2346) --- R-package/src/install.libs.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R-package/src/install.libs.R b/R-package/src/install.libs.R index 85b279a3c42..6226575b19b 100644 --- a/R-package/src/install.libs.R +++ b/R-package/src/install.libs.R @@ -48,11 +48,11 @@ if (!use_precompile) { # Using this kind-of complicated pattern to avoid matching to # things like "pgcc" using_gcc <- grepl( - pattern = '^gcc$|[/\\]+gcc|^gcc\\-[0-9]+$|[/\\]+gcc\\-[0-9]+$' + pattern = '^gcc$|[/\\]+gcc$|^gcc\\-[0-9]+$|[/\\]+gcc\\-[0-9]+$' , x = Sys.getenv('CC', '') ) using_gpp <- grepl( - pattern = '^g\\+\\+$|[/\\]+g\\+\\+|^g\\+\\+\\-[0-9]+$|[/\\]+g\\+\\+\\-[0-9]+$' + pattern = '^g\\+\\+$|[/\\]+g\\+\\+$|^g\\+\\+\\-[0-9]+$|[/\\]+g\\+\\+\\-[0-9]+$' , x = Sys.getenv('CXX', '') ) on_mac <- Sys.info()['sysname'] == 'Darwin'