Commit 585affaf authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

The .gpr files generated for the CrazyFlie don't allow the -mfloat-abi parameter to be passed.

parent e7d08a91
...@@ -270,8 +270,8 @@ def mflags(node): ...@@ -270,8 +270,8 @@ def mflags(node):
result += " -m64 " result += " -m64 "
if kind.startswith("PLATFORM_LEON_RTEMS"): if kind.startswith("PLATFORM_LEON_RTEMS"):
result += " -msoft-float " result += " -msoft-float "
# if kind.startswith("PLATFORM_ARM_CORTEX"): if kind.startswith("PLATFORM_ARM_CORTEX"):
# result += " -mfloat-abi=hard " result += " -mfloat-abi=hard "
return result return result
...@@ -1154,6 +1154,9 @@ def InvokeOcarinaMakefiles( ...@@ -1154,6 +1154,9 @@ def InvokeOcarinaMakefiles(
return cmd + " " return cmd + " "
userCFlags = keepOnlyFirstCompilationOption(userCFlags) userCFlags = keepOnlyFirstCompilationOption(userCFlags)
userLDFlags = keepOnlyFirstCompilationOption(userLDFlags) userLDFlags = keepOnlyFirstCompilationOption(userLDFlags)
if "ARM_CORTEX" in platformType:
userCFlags = userCFlags.replace(" -mfloat-abi=hard ", "") # Not supported by AdaCore's CertyFlie...
userLDFlags = userLDFlags.replace(" -mfloat-abi=hard ", "") # Not supported by AdaCore's CertyFlie...
customFlags = (' USER_CFLAGS="${USER_CFLAGS}%s" USER_LDFLAGS="${USER_LDFLAGS}%s"' % (userCFlags, userLDFlags)) customFlags = (' USER_CFLAGS="${USER_CFLAGS}%s" USER_LDFLAGS="${USER_LDFLAGS}%s"' % (userCFlags, userLDFlags))
mysystem((cmd % customFlags) + extra + externals + "\" make") mysystem((cmd % customFlags) + extra + externals + "\" make")
return AdaIncludePath return AdaIncludePath
......
Supports Markdown
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