chore: use cc instead of hardcoding compiler

dunglas · Oct 7, 2024 · 029ce7e · 029ce7e
1 parent 8d9b6e7
commit 029ce7e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/sanitizers.yaml b/.github/workflows/sanitizers.yaml
@@ -107,7 +107,7 @@ jobs:
         name: Compile edant/watcher
         run: |
           cd edant/watcher/watcher-c/
-          clang -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra -fPIC -shared ${{ matrix.sanitizer == 'msan' && '-fsanitize=memory -fno-omit-frame-pointer -fno-optimize-sibling-calls' || '' }}
+          "$CC" -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra -fPIC -shared ${{ matrix.sanitizer == 'msan' && '-fsanitize=memory -fno-omit-frame-pointer -fno-optimize-sibling-calls' || '' }}
           sudo cp libwatcher.so /usr/local/lib/libwatcher.so
           sudo ldconfig
       -

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -55,7 +55,7 @@ jobs:
         name: Compile edant/watcher
         run: |
           cd edant/watcher/watcher-c/
-          gcc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared
+          cc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared
           sudo cp libwatcher.so /usr/local/lib/libwatcher.so
           sudo ldconfig
       -

diff --git a/Dockerfile b/Dockerfile
@@ -92,7 +92,7 @@ ARG EDANT_WATCHER_VERSION=next
 WORKDIR /usr/local/src/watcher
 RUN curl -L https://github.com/e-dant/watcher/archive/refs/heads/$EDANT_WATCHER_VERSION.tar.gz | tar xz
 WORKDIR /usr/local/src/watcher/watcher-$EDANT_WATCHER_VERSION/watcher-c
-RUN gcc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
+RUN cc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
 	cp libwatcher.so /usr/local/lib/libwatcher.so && \
 	ldconfig /usr/local/lib
 

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -113,7 +113,7 @@ ARG EDANT_WATCHER_VERSION=next
 WORKDIR /usr/local/src/watcher
 RUN curl -L https://github.com/e-dant/watcher/archive/refs/heads/$EDANT_WATCHER_VERSION.tar.gz | tar xz
 WORKDIR /usr/local/src/watcher/watcher-$EDANT_WATCHER_VERSION/watcher-c
-RUN gcc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
+RUN cc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
 	cp libwatcher.so /usr/local/lib/libwatcher.so && \
 	ldconfig /usr/local/lib
 

diff --git a/build-static.sh b/build-static.sh
@@ -146,7 +146,7 @@ fi
 # install edant/watcher for file watching (static version)
 git clone --branch="${EDANT_WATCHER_VERSION:-next}" https://github.com/e-dant/watcher watcher
 cd watcher/watcher-c
-gcc -c -o libwatcher.o ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra -fPIC
+cc -c -o libwatcher.o ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra -fPIC
 ar rcs libwatcher.a libwatcher.o
 cp libwatcher.a "../../buildroot/lib/libwatcher.a"
 cd ../../

diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile
@@ -68,7 +68,7 @@ ARG EDANT_WATCHER_VERSION=next
 WORKDIR /usr/local/src/watcher
 RUN git clone --branch=$EDANT_WATCHER_VERSION https://github.com/e-dant/watcher .
 WORKDIR /usr/local/src/watcher/watcher-c
-RUN gcc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
+RUN cc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
 	cp libwatcher.so /usr/local/lib/libwatcher.so && \
 	ldconfig /usr/local/lib
 

diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -70,7 +70,7 @@ ARG EDANT_WATCHER_VERSION=next
 WORKDIR /usr/local/src/watcher
 RUN git clone --branch=$EDANT_WATCHER_VERSION https://github.com/e-dant/watcher .
 WORKDIR /usr/local/src/watcher/watcher-c
-RUN gcc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
+RUN cc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
 	cp libwatcher.so /usr/local/lib/libwatcher.so && \
 	ldconfig /usr/local/lib