From c1885df1230751824dc29bf8c654ed1cbcd2edde Mon Sep 17 00:00:00 2001
From: Ryan Prichard <rprichard@google.com>
Date: Wed, 1 Sep 2021 23:55:07 -0700
Subject: [PATCH] Switch make to ndk.builds.CMakeModule

This change stops linking gnulib's fcntl on Windows, fixing --output-sync.

Bug: https://github.com/android/ndk/issues/1492
Bug: https://github.com/android/ndk/issues/1546
Change-Id: I8cd16eda2899451a6ae43ec1cf7008122746c576
(cherry picked from commit d5a5e29d90b05f7b7814b20f4834f529fd9896f0)
Merged-In: I8cd16eda2899451a6ae43ec1cf7008122746c576
---
 ndk/checkbuild.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py
index 052a8f71..24658b67 100755
--- a/ndk/checkbuild.py
+++ b/ndk/checkbuild.py
@@ -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]: