Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup related to #1332 #1333

Merged
merged 1 commit into from
Sep 13, 2019
Merged

Cleanup related to #1332 #1333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/base/oven.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,10 +695,7 @@
-- conflicting object file names - hello1.o

function oven.uniqueSequence(f, cfg, seq, bases)
local good_sequence = true
repeat
-- be optimistic
good_sequence = true
while true do
f.sequence = seq[cfg] or 0
seq[cfg] = f.sequence + 1

Expand All @@ -723,12 +720,10 @@
-- not a collision
-- start a sequence for a future basename that matches our objname for this cfg
bases[lowerobj][cfg] = 1
good_sequence = true
else
-- is truly a collision, try the next sequence number
good_sequence = false
break
end
until good_sequence
-- else we have a objname collision, try the next sequence number
end
end


Expand Down