penwing/zeniba-nsxiv
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

config.mk: do not explicitly set CC (#455)

Browse source 
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 <taaparthur@noreply.codeberg.org>
This commit is contained in:
NRK 2023-07-16 18:16:23 +00:00
parent c1b36b8f09
commit 112ba3a2fc
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -47,7 +47,7 @@ jobs:
- name: build - name: build
run: | run: |
# libinotify-kqueue isn't available on homebrew # 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 # force uninstallation with --ignore-dependencies
brew uninstall --ignore-dependencies libxft libexif giflib webp 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

2
config.mk
View file

@ -21,8 +21,6 @@ HAVE_LIBEXIF = $(OPT_DEP_DEFAULT)
HAVE_LIBGIF = $(OPT_DEP_DEFAULT) HAVE_LIBGIF = $(OPT_DEP_DEFAULT)
HAVE_LIBWEBP = $(OPT_DEP_DEFAULT) HAVE_LIBWEBP = $(OPT_DEP_DEFAULT)
# Compiler and linker
CC = c99
# CFLAGS, any additional compiler flags goes here # CFLAGS, any additional compiler flags goes here
CFLAGS = -Wall -pedantic -O2 -DNDEBUG CFLAGS = -Wall -pedantic -O2 -DNDEBUG
# Uncomment for a debug build using gcc/clang # Uncomment for a debug build using gcc/clang