From 112ba3a2fc934113c37e0ad274eaeea13d8c3359 Mon Sep 17 00:00:00 2001 From: NRK Date: Sun, 16 Jul 2023 18:16:23 +0000 Subject: [PATCH] config.mk: do not explicitly set CC (#455) 1. `c99` doesn't exist on openbsd 2. `c99` behaves weirdly on macos (doesn't support -Wall) since make will already set CC (required by POSIX if the implementation supports C, see `man 1p make`) to something appropriate (or it might be set in the environment) go ahead and remove explicitly setting it on our end. Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/455 Reviewed-by: TAAPArthur --- .github/workflows/build.yml | 4 ++-- config.mk | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c3b3c1..97a7c65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: - name: build run: | # libinotify-kqueue isn't available on homebrew - make clean && make -s CC=gcc OPT_DEP_DEFAULT=1 HAVE_INOTIFY=0 + make clean && make -s OPT_DEP_DEFAULT=1 HAVE_INOTIFY=0 # force uninstallation with --ignore-dependencies brew uninstall --ignore-dependencies libxft libexif giflib webp - make clean && make -s CC=gcc OPT_DEP_DEFAULT=0 + make clean && make -s OPT_DEP_DEFAULT=0 diff --git a/config.mk b/config.mk index 7ffb08d..fb28086 100644 --- a/config.mk +++ b/config.mk @@ -21,8 +21,6 @@ HAVE_LIBEXIF = $(OPT_DEP_DEFAULT) HAVE_LIBGIF = $(OPT_DEP_DEFAULT) HAVE_LIBWEBP = $(OPT_DEP_DEFAULT) -# Compiler and linker -CC = c99 # CFLAGS, any additional compiler flags goes here CFLAGS = -Wall -pedantic -O2 -DNDEBUG # Uncomment for a debug build using gcc/clang