Skip to content

Commit 55ea883

Browse files
committed
Revert Makefile to original working flags
Revert to the simple -Wall -Wextra -Werror -pedantic -std=c99 flags that work across all platforms. The extra hardening and warning flags caused build failures due to differences between GCC versions, distro-specific compiler specs, and platform feature availability.
1 parent 0da6512 commit 55ea883

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,7 @@ jobs:
6666
uses: actions/checkout@v6
6767

6868
- name: Build
69-
run: |
70-
if ! make 2>&1; then
71-
echo "## Build Failed" >> $GITHUB_STEP_SUMMARY
72-
echo '```' >> $GITHUB_STEP_SUMMARY
73-
make 2>&1 >> $GITHUB_STEP_SUMMARY || true
74-
echo '```' >> $GITHUB_STEP_SUMMARY
75-
exit 1
76-
fi
69+
run: make
7770

7871
- name: Verify binary
7972
run: ./thinproxy -V
@@ -133,14 +126,7 @@ jobs:
133126
uses: actions/checkout@v6
134127

135128
- name: Build
136-
run: |
137-
if ! make 2>&1; then
138-
echo "## Build Failed" >> $GITHUB_STEP_SUMMARY
139-
echo '```' >> $GITHUB_STEP_SUMMARY
140-
make 2>&1 >> $GITHUB_STEP_SUMMARY || true
141-
echo '```' >> $GITHUB_STEP_SUMMARY
142-
exit 1
143-
fi
129+
run: make
144130

145131
- name: Verify binary
146132
run: ./thinproxy -V

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
CC ?= cc
22
CFLAGS ?= -O2 -pipe
3-
WARNINGS = -Wall -Wextra -Werror -pedantic -std=c99 \
4-
-Wformat -Wformat-security \
5-
-Wshadow -Wstrict-prototypes -Wmissing-prototypes \
6-
-Wold-style-definition -Wimplicit-fallthrough
7-
HARDENING = -fstack-protector-strong -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
3+
CFLAGS += -Wall -Wextra -Werror -pedantic -std=c99
84

95
PREFIX ?= /usr/local
106
BINDIR ?= $(PREFIX)/bin
@@ -14,7 +10,7 @@ UNITDIR ?= /lib/systemd/system
1410
all: thinproxy
1511

1612
thinproxy: thinproxy.c
17-
$(CC) $(CFLAGS) $(WARNINGS) $(HARDENING) $(LDFLAGS) -o $@ thinproxy.c
13+
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ thinproxy.c
1814

1915
install: thinproxy
2016
install -d $(DESTDIR)$(BINDIR)

0 commit comments

Comments
 (0)