Use File::PATH_SEPARATOR instead of : to fix Windows

mudge · Jul 17, 2023 · a1a9ec6 · a1a9ec6
1 parent e084ceb
commit a1a9ec6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ext/re2/extconf.rb b/ext/re2/extconf.rb
@@ -355,9 +355,9 @@ def build_with_vendored_libraries
  pkg_config_paths = [
  "#{abseil_recipe.path}/lib/pkgconfig",
  "#{re2_recipe.path}/lib/pkgconfig"
- ].join(':')
+ ].join(File::PATH_SEPARATOR)
 
- pkg_config_paths = "#{ENV['PKG_CONFIG_PATH']}:#{pkg_config_paths}" if ENV['PKG_CONFIG_PATH']
+ pkg_config_paths = "#{ENV['PKG_CONFIG_PATH']}#{File::PATH_SEPARATOR}#{pkg_config_paths}" if ENV['PKG_CONFIG_PATH']
 
  ENV['PKG_CONFIG_PATH'] = pkg_config_paths
  pc_file = File.join(re2_recipe.path, 'lib', 'pkgconfig', 're2.pc')

diff --git a/scripts/test-gem-build b/scripts/test-gem-build
@@ -24,7 +24,7 @@ if [[ "${BUILD_NATIVE_GEM}" == "ruby" ]] ; then
  bundle exec rake clean compile
  bundle exec rake gem
 else
- bundle exec rake gem:${BUILD_NATIVE_GEM}
+ bundle exec rake gem:${BUILD_NATIVE_GEM}:builder
 fi
 
 mkdir -p ${OUTPUT_DIR}