Commit 9d1b9d89 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'upgrade_re2' into 'master'

Upgrade re2 to support seperate CXX and CC passing

See merge request !13064
parents ba24fa87 2f0a4243
...@@ -165,7 +165,7 @@ gem 'rainbow', '~> 2.2' ...@@ -165,7 +165,7 @@ gem 'rainbow', '~> 2.2'
gem 'settingslogic', '~> 2.0.9' gem 'settingslogic', '~> 2.0.9'
# Linear-time regex library for untrusted regular expressions # Linear-time regex library for untrusted regular expressions
gem 're2', '~> 1.1.0' gem 're2', '~> 1.1.1'
# Misc # Misc
......
...@@ -660,7 +660,7 @@ GEM ...@@ -660,7 +660,7 @@ GEM
debugger-ruby_core_source (~> 1.3) debugger-ruby_core_source (~> 1.3)
rdoc (4.2.2) rdoc (4.2.2)
json (~> 1.4) json (~> 1.4)
re2 (1.1.0) re2 (1.1.1)
recaptcha (3.0.0) recaptcha (3.0.0)
json json
recursive-open-struct (1.0.0) recursive-open-struct (1.0.0)
...@@ -1060,7 +1060,7 @@ DEPENDENCIES ...@@ -1060,7 +1060,7 @@ DEPENDENCIES
raindrops (~> 0.18) raindrops (~> 0.18)
rblineprof (~> 0.3.6) rblineprof (~> 0.3.6)
rdoc (~> 4.2) rdoc (~> 4.2)
re2 (~> 1.1.0) re2 (~> 1.1.1)
recaptcha (~> 3.0) recaptcha (~> 3.0)
redcarpet (~> 3.4) redcarpet (~> 3.4)
redis (~> 3.2) redis (~> 3.2)
......
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