From a1a9ec6984a8d278063451a152d852ad1b474ab3 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 16 Jul 2023 08:16:19 -0700
Subject: [PATCH] Use File::PATH_SEPARATOR instead of : to fix Windows

---
 ext/re2/extconf.rb     | 4 ++--
 scripts/test-gem-build | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/re2/extconf.rb b/ext/re2/extconf.rb
index e98fc39..1d76ae9 100644
--- 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
index 21ebcbd..0bdd772 100755
--- 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}