diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2018-04-13 12:26:41 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-04-13 17:11:12 -0300 |
commit | 277baba01e09a1456e4aeb8afcd1f29c1d2eefbc (patch) | |
tree | f1c2ab44fc5ba0aad8feec3cb650461475bd2ca0 /src | |
parent | 6bab7030971e07cb8950cb829cef58ba5debe792 (diff) | |
download | luarocks-277baba01e09a1456e4aeb8afcd1f29c1d2eefbc.tar.gz luarocks-277baba01e09a1456e4aeb8afcd1f29c1d2eefbc.tar.bz2 luarocks-277baba01e09a1456e4aeb8afcd1f29c1d2eefbc.zip |
fixup: always check external dependencies, even with --nodeps
Diffstat (limited to 'src')
-rw-r--r-- | src/luarocks/build.lua | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua index c9e36d89..f7de616d 100644 --- a/src/luarocks/build.lua +++ b/src/luarocks/build.lua | |||
@@ -173,16 +173,17 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m | |||
173 | return nil, "Rockspec error: build type not specified" | 173 | return nil, "Rockspec error: build type not specified" |
174 | end | 174 | end |
175 | 175 | ||
176 | if not build_only_deps then | ||
177 | local ok, err, errcode = deps.check_external_deps(rockspec, "build") | ||
178 | if err then | ||
179 | return nil, err, errcode | ||
180 | end | ||
181 | end | ||
182 | |||
176 | if deps_mode == "none" then | 183 | if deps_mode == "none" then |
177 | util.warning("skipping dependency checks.") | 184 | util.warning("skipping dependency checks.") |
178 | else | 185 | else |
179 | |||
180 | if not build_only_deps then | 186 | if not build_only_deps then |
181 | local ok, err, errcode = deps.check_external_deps(rockspec, "build") | ||
182 | if err then | ||
183 | return nil, err, errcode | ||
184 | end | ||
185 | |||
186 | if next(rockspec.build_dependencies) then | 187 | if next(rockspec.build_dependencies) then |
187 | local ok, err, errcode = deps.fulfill_dependencies(rockspec, "build_dependencies", deps_mode) | 188 | local ok, err, errcode = deps.fulfill_dependencies(rockspec, "build_dependencies", deps_mode) |
188 | if err then | 189 | if err then |