fix Windows cross-compilation hack

2 files changed, 15 insertions, 13 deletions

diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 093fe768..36080eb9 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -438,18 +438,6 @@ function cmd.run_command(description, commands, external_namespace, ...)
    -- Preliminary initialization
    cfg.init()
 
-   -- FIXME A quick hack for the experimental Windows build
-   if os.getenv("LUAROCKS_CROSS_COMPILING") then
-      cfg.each_platform = function()
-         local i = 0
-         local plats = { "unix", "linux" }
-         return function()
-            i = i + 1
-            return plats[i]
-         end
-      end
-   end
-
    fs.init()
 
    for _, module_name in ipairs(fs.modules(external_namespace)) do
diff --git a/src/luarocks/fs.lua b/src/luarocks/fs.lua
index 06f7e3fd..672d8991 100644
--- a/src/luarocks/fs.lua
+++ b/src/luarocks/fs.lua
@@ -61,7 +61,21 @@ do
    end
 
    local function load_platform_fns(patt, inits)
-      for platform in cfg.each_platform("most-specific-first") do
+      local each_platform = cfg.each_platform
+
+      -- FIXME A quick hack for the experimental Windows build
+      if os.getenv("LUAROCKS_CROSS_COMPILING") then
+         each_platform = function()
+            local i = 0
+            local plats = { "linux", "unix" }
+            return function()
+               i = i + 1
+               return plats[i]
+            end
+         end
+      end
+
+      for platform in each_platform("most-specific-first") do
          local ok, fs_plat = pcall(require, patt:format(platform))
          if ok and fs_plat then
             load_fns(fs_plat, inits)