From 32ecf024ef34cbdc941d487bc567da9653e6f49b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 2 Apr 2022 15:30:42 +0000
Subject: [PATCH] Use standardized `CC`, `AR`, `NM` env vars

Companion to https://github.com/WebAssembly/wasi-libc/pull/275
---
 Makefile      | 4 +++-
 src/wasi-libc | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ddf6eea..68b5768 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,9 @@ build/llvm.BUILT:
 
 build/wasi-libc.BUILT: build/llvm.BUILT
 	$(MAKE) -C $(ROOT_DIR)/src/wasi-libc \
-		WASM_CC=$(BUILD_PREFIX)/bin/clang \
+		CC=$(BUILD_PREFIX)/bin/clang \
+		AR=$(BUILD_PREFIX)/bin/llvm-ar \
+		NM=$(BUILD_PREFIX)/bin/llvm-nm \
 		SYSROOT=$(BUILD_PREFIX)/share/wasi-sysroot
 	touch build/wasi-libc.BUILT
 
diff --git a/src/wasi-libc b/src/wasi-libc
index ad51334..a279514 160000
--- a/src/wasi-libc
+++ b/src/wasi-libc
@@ -1 +1 @@
-Subproject commit ad5133410f66b93a2381db5b542aad5e0964db96
+Subproject commit a279514a6ef30cd8ee1469345b33172fcbc8d52d