Commit 6c8e66d2 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Patch from Jerome, after latest updates in POHI.

parent d7bb5760
...@@ -1012,6 +1012,7 @@ def InvokeOcarinaMakefiles( ...@@ -1012,6 +1012,7 @@ def InvokeOcarinaMakefiles(
asn1target = "auto-src_" + g_distributionNodesPlatform[node][0] asn1target = "auto-src_" + g_distributionNodesPlatform[node][0]
asn1target = os.path.abspath(asn1target) asn1target = os.path.abspath(asn1target)
poHiAdaLinkCmd = "" poHiAdaLinkCmd = ""
poHiAdaLinkLibs = ""
# in case of rebuilds # in case of rebuilds
mysystem("rm -rf \"%s\" 2>/dev/null ; exit 0" % asn1target) mysystem("rm -rf \"%s\" 2>/dev/null ; exit 0" % asn1target)
if not os.path.exists(asn1target): if not os.path.exists(asn1target):
...@@ -1052,6 +1053,12 @@ def InvokeOcarinaMakefiles( ...@@ -1052,6 +1053,12 @@ def InvokeOcarinaMakefiles(
if poHiAdaLinkCmd == "": if poHiAdaLinkCmd == "":
panic("There was no line containing 'adalib' inside 'ada-start.adb'") panic("There was no line containing 'adalib' inside 'ada-start.adb'")
poHiAdaLinkCmd += " -lgnat -lgnarl" poHiAdaLinkCmd += " -lgnat -lgnarl"
# Patch from Jerome, after latest updates in POHI:
# RTEMS builds expect user-provided libraries to be provided through the LD_LIBS macro,
# other PolyORB-HI/C can use directly USER_LDFLAGS
poHiAdaLinkLibs += " LD_LIBS=\"-lgnat -lgnarl\" "
os.chdir("..") os.chdir("..")
externals += asn1target + '/*.o ' externals += asn1target + '/*.o '
...@@ -1221,7 +1228,7 @@ def InvokeOcarinaMakefiles( ...@@ -1221,7 +1228,7 @@ def InvokeOcarinaMakefiles(
userCFlags = userCFlags.replace("-fshort-double", "") # Not supported when compiling Ada userCFlags = userCFlags.replace("-fshort-double", "") # Not supported when compiling Ada
userLDFlags = userLDFlags.replace("-fshort-double", "") # Not supported when compiling Ada userLDFlags = userLDFlags.replace("-fshort-double", "") # Not supported when compiling Ada
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 + "\"" + poHiAdaLinkLibs + " make")
return AdaIncludePath return AdaIncludePath
......
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