Commit 46470887 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras

Complex interactions when the same library is specified in multiple functional blocks.

parent d7f574cf
......@@ -1300,20 +1300,6 @@ def InvokeOcarinaMakefiles(
if len(cppSubsystems)>0:
userLDFlags += " -lstdc++ "
# Workaround for bug in the new GNAT - crashes if it sees multiple -m32
def keepOnlyFirstCompilationOption(flags):
cmd = ""
tokensUnique = {}
for token in flags.split():
if token.startswith("-") and not token.startswith("-I"):
if token not in tokensUnique:
tokensUnique[token] = 1
cmd += " " + token
else:
cmd += " " + token
return cmd + " "
userCFlags = keepOnlyFirstCompilationOption(userCFlags)
userLDFlags = keepOnlyFirstCompilationOption(userLDFlags)
if "GNAT_RUNTIME" in platformType:
userCFlags = userCFlags.replace(" -mfloat-abi=hard ", " ") # Not supported when compiling Ada
userLDFlags = userLDFlags.replace(" -mfloat-abi=hard ", " ") # Not supported when compiling Ada
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment