diff options
| author | ruki <[email protected]> | 2022-10-06 00:44:26 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-10-06 00:44:26 +0800 |
| commit | 8055b6a045eabe62935a550e5d58d13591950c11 (patch) | |
| tree | b8344e53fd308ed015d8c36afe5fec2600f5fc97 | |
| parent | bfb1168579f225fbf467891f3617b73f65075b58 (diff) | |
add more info
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 479a103bc..b6b218fdb 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -925,13 +925,16 @@ end -- cannot be detected at present and can only be resolved by the user -- function _check_package_depconflicts(package) + local packages = {} local packagekeys = {} for _, dep in ipairs(package:librarydeps()) do local key = _get_packagekey(dep:name(), dep:requireinfo()) local prevkey = packagekeys[dep:name()] if prevkey then - assert(key == prevkey, "package(%s): conflict dependences with package(%s)!", key, prevkey) + local prevpkg = packages[dep:name()] + assert(key == prevkey, "package(%s in %s): conflict dependences with package(%s in %s)!", key, package:name(), prevkey, prevpkg:name()) else + packages[dep:name()] = package packagekeys[dep:name()] = key end end |
