1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From: =?utf-8?b?IlNaIExpbiAo5p6X5LiK5pm6KSI=?= <szlin@debian.org>
Date: Sun, 2 Sep 2018 22:47:13 +0800
Subject: Allow addition of hardening flags and also removes the artificial
distinction between 32bit and 64bit binaries.
---
src/Makefile | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index c166acd..651675d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,37 +2,31 @@
## Makefile for sp
##
-CFLAGS = -W -Wall -std=c99 -O2 -s
+CFLAGS += -W -Wall -std=c99 -O2 -s
#CFLAGS = -W -Wall -std=c99 -g
-CC_LINUX32 = gcc
-CC_LINUX64 = gcc
+CC_LINUX32 = $(CC)
+CC_LINUX64 = $(CC)
CC_WINDOWS32 = /usr/bin/i686-w64-mingw32-gcc
CC_WINDOWS64 = /usr/bin/x86_64-w64-mingw32-gcc
CC_OSX32 = /usr/bin/i686-apple-darwin10-gcc
CC_OSX64 = /usr/bin/i686-apple-darwin10-gcc
-CFLAGS_LINUX32 = $(CFLAGS) -m32 -DLINUX
-CFLAGS_LINUX64 = $(CFLAGS) -m64 -DLINUX
+CFLAGS_LINUX32 = $(CFLAGS) -DLINUX
+CFLAGS_LINUX64 = $(CFLAGS) -DLINUX
CFLAGS_WINDOWS32 = $(CFLAGS) -m32 -DWINDOWS
CFLAGS_WINDOWS64 = $(CFLAGS) -m64 -DWINDOWS
CFLAGS_OSX32 = $(CFLAGS) -m32 -DOSX
CFLAGS_OSX64 = $(CFLAGS) -m64 -DOSX
-all: sp64.bin
-
-sp32: sp32.bin sp32.exe sp32.app
-sp64: sp64.bin sp64.exe sp64.app
+all: sp64
clean:
rm -f sp32.bin sp64.bin sp32.exe sp64.exe sp32.app sp64.app
-sp32.bin: sp.c
- $(CC_LINUX32) $(CFLAGS_LINUX32) -o $@ $^
-
-sp64.bin: sp.c
- $(CC_LINUX64) $(CFLAGS_LINUX64) -o $@ $^
-
+sp64: sp.c
+ $(CC_LINUX64) $(CPPFLAGS) $(CFLAGS_LINUX64) -o $@ $^ $(LDFLAGS)
+
sp32.exe: sp.c
$(CC_WINDOWS32) $(CFLAGS_WINDOWS32) -o $@ $^
|
