Fix macro Crystal::LIBRARY_PATH.split when cross-compiling (#14330)

crystal-lang · Feb 29, 2024 · 8869186 · 8869186
1 parent 7f92639
commit 8869186
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/crystal/system/win32/process.cr b/src/crystal/system/win32/process.cr
@@ -7,6 +7,12 @@ require "process/shell"
 require "crystal/atomic_semaphore"
 
 struct Crystal::System::Process
+  {% if host_flag?(:windows) %}
+    HOST_PATH_DELIMITER = ';'
+  {% else %}
+    HOST_PATH_DELIMITER = ':'
+  {% end %}
+
   getter pid : LibC::DWORD
   @thread_id : LibC::DWORD
   @process_handle : LibC::HANDLE

diff --git a/src/llvm/lib_llvm.cr b/src/llvm/lib_llvm.cr
@@ -1,7 +1,7 @@
 {% begin %}
   {% if flag?(:win32) && !flag?(:static) %}
     {% config = nil %}
-    {% for dir in Crystal::LIBRARY_PATH.split(';') %}
+    {% for dir in Crystal::LIBRARY_PATH.split(Crystal::System::Process::HOST_PATH_DELIMITER) %}
       {% config ||= read_file?("#{dir.id}/llvm_VERSION") %}
     {% end %}
 

diff --git a/src/openssl/lib_crypto.cr b/src/openssl/lib_crypto.cr
@@ -3,7 +3,7 @@
     {% if flag?(:win32) %}
       {% from_libressl = false %}
       {% ssl_version = nil %}
-      {% for dir in Crystal::LIBRARY_PATH.split(';') %}
+      {% for dir in Crystal::LIBRARY_PATH.split(Crystal::System::Process::HOST_PATH_DELIMITER) %}
         {% unless ssl_version %}
           {% config_path = "#{dir.id}\\openssl_VERSION" %}
           {% if config_version = read_file?(config_path) %}

diff --git a/src/openssl/lib_ssl.cr b/src/openssl/lib_ssl.cr
@@ -9,7 +9,7 @@ require "./lib_crypto"
     {% if flag?(:win32) %}
       {% from_libressl = false %}
       {% ssl_version = nil %}
-      {% for dir in Crystal::LIBRARY_PATH.split(';') %}
+      {% for dir in Crystal::LIBRARY_PATH.split(Crystal::System::Process::HOST_PATH_DELIMITER) %}
         {% unless ssl_version %}
           {% config_path = "#{dir.id}\\openssl_VERSION" %}
           {% if config_version = read_file?(config_path) %}