`WASM_AR` -> `AR` to use standardized env var

Progress towards #269

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 54cbd694e728c94c6a738c40e695f0acfbb7383e..7efb5d6e6a4dbca59b14fa7abe41f429a7f30a36 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
         7z x LLVM-10.0.0-win64.exe -y -o"llvm"
         echo "$(pwd)/llvm/bin" >> $GITHUB_PATH
         echo "CC=$(pwd)/llvm/bin/clang.exe" >> $GITHUB_ENV
-        echo "WASM_AR=$(pwd)/llvm/bin/llvm-ar.exe" >> $GITHUB_ENV
+        echo "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'
 
@@ -39,7 +39,7 @@ jobs:
         export CLANG_DIR=`pwd`/clang+llvm-10.0.0-x86_64-apple-darwin/bin
         echo "$CLANG_DIR" >> $GITHUB_PATH
         echo "CC=$CLANG_DIR/clang" >> $GITHUB_ENV
-        echo "WASM_AR=$CLANG_DIR/llvm-ar" >> $GITHUB_ENV
+        echo "AR=$CLANG_DIR/llvm-ar" >> $GITHUB_ENV
         echo "WASM_NM=$CLANG_DIR/llvm-nm" >> $GITHUB_ENV
       if: matrix.os == 'macos-latest'
 
@@ -50,7 +50,7 @@ jobs:
         export CLANG_DIR=`pwd`/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin
         echo "$CLANG_DIR" >> $GITHUB_PATH
         echo "CC=$CLANG_DIR/clang" >> $GITHUB_ENV
-        echo "WASM_AR=$CLANG_DIR/llvm-ar" >> $GITHUB_ENV
+        echo "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 a17aa248b65a2086e02547dad8a00668be5971f3..6d5f8dd6e8107d0d29d06f5ab0bc9f2fc823bda9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # command-line.
 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)))
+AR ?= $(patsubst %clang,%llvm-ar,$(filter-out ccache sccache,$(CC)))
 EXTRA_CFLAGS ?= -O2 -DNDEBUG
 # The directory where we build the sysroot.
 SYSROOT ?= $(CURDIR)/sysroot
@@ -363,13 +363,13 @@ $(SYSROOT_LIB)/libwasi-emulated-signal.a: $(LIBWASI_EMULATED_SIGNAL_OBJS) $(LIBW
 %.a:
        @mkdir -p "$(@D)"
        # On Windows, the commandline for the ar invocation got too long, so it needs to be split up.
-       $(WASM_AR) crs $@ $(wordlist 1, 199, $^)
-       $(WASM_AR) crs $@ $(wordlist 200, 399, $^)
-       $(WASM_AR) crs $@ $(wordlist 400, 599, $^)
-       $(WASM_AR) crs $@ $(wordlist 600, 799, $^)
+       $(AR) crs $@ $(wordlist 1, 199, $^)
+       $(AR) crs $@ $(wordlist 200, 399, $^)
+       $(AR) crs $@ $(wordlist 400, 599, $^)
+       $(AR) crs $@ $(wordlist 600, 799, $^)
        # This might eventually overflow again, but at least it'll do so in a loud way instead of
        # silently dropping the tail.
-       $(WASM_AR) crs $@ $(wordlist 800, 100000, $^)
+       $(AR) crs $@ $(wordlist 800, 100000, $^)
 
 $(MUSL_PRINTSCAN_OBJS): CFLAGS += \
            -D__wasilibc_printscan_no_long_double \
@@ -468,7 +468,7 @@ finish: startup_files libc
        # Create empty placeholder libraries.
        #
        for name in m rt pthread crypt util xnet resolv dl; do \
-           $(WASM_AR) crs "$(SYSROOT_LIB)/lib$${name}.a"; \
+           $(AR) crs "$(SYSROOT_LIB)/lib$${name}.a"; \
        done
 
        #

diff --git a/README.md b/README.md
index 81b328d007b88dafa45f0a9c1101fe294f7781d5..6777a801b23993df5b1f60d4ba5a5495a0be7f88 100644 (file)
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ and then run:
 
 ```sh
 make CC=/path/to/clang/with/wasm/support \
-     WASM_AR=/path/to/llvm-ar \
+     AR=/path/to/llvm-ar \
      WASM_NM=/path/to/llvm-nm
 ```