2 files changed, 7 insertions, 2 deletions

diff --git a/binary/all_in_one b/binary/all_in_one
index 63c6ef98..ca5ee49d 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -481,7 +481,7 @@ local function main()
       print("----------------------------------------------------------------")
       local vers = manif.get_versions(queries.from_dep_string(name), "one")
       if not next(vers) then
-         local ok = os.execute("LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install '--tree=" .. LUA_MODULES .. "' " .. arg)
+         local ok = os.execute("LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --no-project '--tree=" .. LUA_MODULES .. "' " .. arg)
          if ok ~= 0 and ok ~= true then
             error("Failed building dependency: " .. name)
          end
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 962d9256..3abad789 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -293,7 +293,11 @@ do
       end
 
       detect_config_via_args = function(args)
-         local project_dir, given = find_project_dir(args.project_tree)
+         local project_dir, given
+         if not args.no_project then
+            project_dir, given = find_project_dir(args.project_tree)
+         end
+
          local detected = detect_lua_via_args(args, project_dir)
          if args.lua_version then
             detected.given_lua_version = args.lua_version
@@ -469,6 +473,7 @@ Enabling completion for Fish:
    parser:flag("--local", "Use the tree in the user's home directory.\n"..
       "To enable it, see '"..program.." help path'.")
    parser:flag("--global", "Use the system tree when `local_by_default` is `true`.")
+   parser:flag("--no-project", "Do not use project tree even if running from a project folder.")
    parser:flag("--verbose", "Display verbose output of commands executed.")
    parser:option("--timeout", "Timeout on network operations, in seconds.\n"..
       "0 means no timeout (wait forever). Default is "..