Unverified Commit 5e602244 authored by James Lamb's avatar James Lamb Committed by GitHub
Browse files

fixed compiler check regex in install.libs.R (#2346)

parent 15d861ce
...@@ -48,11 +48,11 @@ if (!use_precompile) { ...@@ -48,11 +48,11 @@ if (!use_precompile) {
# Using this kind-of complicated pattern to avoid matching to # Using this kind-of complicated pattern to avoid matching to
# things like "pgcc" # things like "pgcc"
using_gcc <- grepl( 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', '') , x = Sys.getenv('CC', '')
) )
using_gpp <- grepl( 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', '') , x = Sys.getenv('CXX', '')
) )
on_mac <- Sys.info()['sysname'] == 'Darwin' on_mac <- Sys.info()['sysname'] == 'Darwin'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment