Skip to content

Commit

Permalink
Switch make to ndk.builds.CMakeModule
Browse files Browse the repository at this point in the history
This change stops linking gnulib's fcntl on Windows, fixing --output-sync.

Bug: android/ndk#1492
Bug: android/ndk#1546
Change-Id: I8cd16eda2899451a6ae43ec1cf7008122746c576
(cherry picked from commit d5a5e29)
Merged-In: I8cd16eda2899451a6ae43ec1cf7008122746c576
  • Loading branch information
rprichard authored and Android Build Coastguard Worker committed Apr 22, 2022
1 parent ac71566 commit c1885df
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions ndk/checkbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -645,15 +645,12 @@ def install(self) -> None:
make_symlink(symlink_name, lib)


class Make(ndk.builds.AutoconfModule):
class Make(ndk.builds.CMakeModule):
name = 'make'
path = Path('prebuilt/{host}')
notice_group = ndk.builds.NoticeGroup.TOOLCHAIN
src = ANDROID_DIR / 'toolchain/make'
# The macOS sed chokes on invalid UTF-8 in config.h-vms.template, at least
# for the old version on some build servers. (It works fine locally on
# 10.15.) This is stackoverflow's suggested workaround.
env = {'LC_ALL': 'C', 'LANG': 'C'}
deps = {'clang'}

@property
def notices(self) -> Iterator[Path]:
Expand Down

0 comments on commit c1885df

Please sign in to comment.