From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 22 Mar 2022 22:33:41 +0000 (+0000)
Subject: `WASM_CC` -> `CC` to use standardized env var
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9e09e02a8f08cb2238506ee40f0dc46df689ddad;p=wasi-libc.git

`WASM_CC` -> `CC` to use standardized env var

Progress towards #269
---

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9f525bb..54cbd69 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
         curl -fsSLO https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe
         7z x LLVM-10.0.0-win64.exe -y -o"llvm"
         echo "$(pwd)/llvm/bin" >> $GITHUB_PATH
-        echo "WASM_CC=$(pwd)/llvm/bin/clang.exe" >> $GITHUB_ENV
+        echo "CC=$(pwd)/llvm/bin/clang.exe" >> $GITHUB_ENV
         echo "WASM_AR=$(pwd)/llvm/bin/llvm-ar.exe" >> $GITHUB_ENV
         echo "WASM_NM=$(pwd)/llvm/bin/llvm-nm.exe" >> $GITHUB_ENV
       if: matrix.os == 'windows-latest'
@@ -38,7 +38,7 @@ jobs:
         curl -sSfL https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-apple-darwin.tar.xz | tar xJf -
         export CLANG_DIR=`pwd`/clang+llvm-10.0.0-x86_64-apple-darwin/bin
         echo "$CLANG_DIR" >> $GITHUB_PATH
-        echo "WASM_CC=$CLANG_DIR/clang" >> $GITHUB_ENV
+        echo "CC=$CLANG_DIR/clang" >> $GITHUB_ENV
         echo "WASM_AR=$CLANG_DIR/llvm-ar" >> $GITHUB_ENV
         echo "WASM_NM=$CLANG_DIR/llvm-nm" >> $GITHUB_ENV
       if: matrix.os == 'macos-latest'
@@ -49,7 +49,7 @@ jobs:
         curl -sSfL https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz | tar xJf -
         export CLANG_DIR=`pwd`/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin
         echo "$CLANG_DIR" >> $GITHUB_PATH
-        echo "WASM_CC=$CLANG_DIR/clang" >> $GITHUB_ENV
+        echo "CC=$CLANG_DIR/clang" >> $GITHUB_ENV
         echo "WASM_AR=$CLANG_DIR/llvm-ar" >> $GITHUB_ENV
         echo "WASM_NM=$CLANG_DIR/llvm-nm" >> $GITHUB_ENV
       if: matrix.os == 'ubuntu-latest'
diff --git a/Makefile b/Makefile
index 33727c2..adeab96 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # These variables are specifically meant to be overridable via the make
 # command-line.
-WASM_CC ?= clang
+CC ?= clang
 WASM_NM ?= $(patsubst %clang,%llvm-nm,$(filter-out ccache sccache,$(WASM_CC)))
 WASM_AR ?= $(patsubst %clang,%llvm-ar,$(filter-out ccache sccache,$(WASM_CC)))
 WASM_CFLAGS ?= -O2 -DNDEBUG
@@ -382,15 +382,15 @@ $(LIBWASI_EMULATED_SIGNAL_MUSL_OBJS): CFLAGS += \
 
 $(OBJDIR)/%.long-double.o: $(CURDIR)/%.c include_dirs
 	@mkdir -p "$(@D)"
-	$(WASM_CC) $(CFLAGS) -MD -MP -o $@ -c $<
+	$(CC) $(CFLAGS) -MD -MP -o $@ -c $<
 
 $(OBJDIR)/%.no-floating-point.o: $(CURDIR)/%.c include_dirs
 	@mkdir -p "$(@D)"
-	$(WASM_CC) $(CFLAGS) -MD -MP -o $@ -c $<
+	$(CC) $(CFLAGS) -MD -MP -o $@ -c $<
 
 $(OBJDIR)/%.o: $(CURDIR)/%.c include_dirs
 	@mkdir -p "$(@D)"
-	$(WASM_CC) $(CFLAGS) -MD -MP -o $@ -c $<
+	$(CC) $(CFLAGS) -MD -MP -o $@ -c $<
 
 -include $(shell find $(OBJDIR) -name \*.d)
 
@@ -448,7 +448,7 @@ startup_files: include_dirs
 	#
 	@mkdir -p "$(OBJDIR)"
 	cd "$(OBJDIR)" && \
-	$(WASM_CC) $(CFLAGS) -c $(LIBC_BOTTOM_HALF_CRT_SOURCES) -MD -MP && \
+	$(CC) $(CFLAGS) -c $(LIBC_BOTTOM_HALF_CRT_SOURCES) -MD -MP && \
 	mkdir -p "$(SYSROOT_LIB)" && \
 	mv *.o "$(SYSROOT_LIB)"
 
@@ -517,7 +517,7 @@ check-symbols: startup_files libc
 	#
 	# Test that it compiles.
 	#
-	$(WASM_CC) $(CFLAGS) -fsyntax-only "$(SYSROOT_SHARE)/include-all.c" -Wno-\#warnings
+	$(CC) $(CFLAGS) -fsyntax-only "$(SYSROOT_SHARE)/include-all.c" -Wno-\#warnings
 
 	#
 	# Collect all the predefined macros, except for compiler version macros
@@ -533,7 +533,7 @@ check-symbols: startup_files libc
 	@#
 	@# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0.
 	@# TODO: Filter out __FLT16_* for now, as not all versions of clang have these.
-	$(WASM_CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
+	$(CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
 	    -isystem $(SYSROOT_INC) \
 	    -std=gnu17 \
 	    -E -dM -Wno-\#warnings \
diff --git a/README.md b/README.md
index 0cb697d..81b328d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ To build a WASI sysroot from source, obtain a WebAssembly-supporting C compiler
 and then run:
 
 ```sh
-make WASM_CC=/path/to/clang/with/wasm/support \
+make CC=/path/to/clang/with/wasm/support \
      WASM_AR=/path/to/llvm-ar \
      WASM_NM=/path/to/llvm-nm
 ```