From 46470887c6e4a7f81d22033bcebaa6d7d442ba7f Mon Sep 17 00:00:00 2001 From: Thanassis Tsiodras Date: Tue, 12 Nov 2019 14:07:30 +0100 Subject: [PATCH] Complex interactions when the same library is specified in multiple functional blocks. --- orchestrator/taste-orchestrator.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/orchestrator/taste-orchestrator.py b/orchestrator/taste-orchestrator.py index 2b7f24d..ed8757a 100644 --- a/orchestrator/taste-orchestrator.py +++ b/orchestrator/taste-orchestrator.py @@ -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 -- GitLab