Skip to content

Commit

Permalink
Merge branch 'topic/kliemann/bb-runtimes-78-windows-native' into 'mas…
Browse files Browse the repository at this point in the history
…ter'

Select the proper sources for Windows native runtimes

See merge request eng/toolchain/bb-runtimes!128
  • Loading branch information
jklmnn committed Aug 26, 2024
2 parents 35f4f72 + d7bc70d commit c887568
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build_rts.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,11 @@ def build_configs(target):
t = X8664Generic()
# native platforms
elif target in ("x86-linux", "x86-windows"):
t = X86Native()
t = X86Native(target)
elif target in ("x86_64-linux", "x86_64-windows", "x86_64-windows64"):
t = X8664Native()
t = X8664Native(target)
elif target in ("aarch64-linux",):
t = Aarch64Native()
t = Aarch64Native(target)
# vx7r2cert
elif target == "aarch64-vx7r2cert":
t = AArch64Vx7r2Cert()
Expand Down
7 changes: 6 additions & 1 deletion native/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@


class Native(DFBBTarget):
def __init__(self):
def __init__(self, target):
super().__init__()
self.add_gnat_sources("src/s-macres__native.adb")
# Use the bb source of s-textio for Windows as a custom
# source profile is not yet supported.
# eng/toolchain/bb-runtimes#78
if "windows" in target:
self.add_gnat_sources("src/s-textio__stdio.adb")

@property
def target(self):
Expand Down

0 comments on commit c887568

Please sign in to comment.