Skip to content

Commit

Permalink
Merge pull request #1333 from ratzlaff/case_collision_cleanup
Browse files Browse the repository at this point in the history
Cleanup related to #1332
  • Loading branch information
samsinsane authored Sep 13, 2019
2 parents 53e4f81 + 25a580f commit d0377b9
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions src/base/oven.lua
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

0 comments on commit d0377b9

Please sign in to comment.