about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-11-22 18:36:04 -0800
committerKartik K. Agaram <vc@akkartik.com>2021-11-22 18:36:04 -0800
commitef680411370a5f999b0127f6cad1a8db6fcc2dd7 (patch)
treeb58eb1a8abdabbbcfdcf57231e870d006c0f8c81 /src
parent3b4d7131cbe4615b24d96e2b053b8b38cafd6fd8 (diff)
downloadteliva-ef680411370a5f999b0127f6cad1a8db6fcc2dd7.tar.gz
standardize CFLAGS in luasocket
Diffstat (limited to 'src')
-rw-r--r--src/luasocket/makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/luasocket/makefile b/src/luasocket/makefile
index c087a19..06e7ab2 100644
--- a/src/luasocket/makefile
+++ b/src/luasocket/makefile
@@ -49,7 +49,7 @@ LDIR_macosx?=share/lua/$(LUAV)
 # /usr/local/include/lua$(LUAV)
 # where lua headers are found for linux builds
 LUAINC_linux_base?=/usr/include
-LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUAV) $(LUAINC_linux_base)/lua$(LUAV)
+LUAINC_linux?=..
 LUAPREFIX_linux?=/usr/local
 CDIR_linux?=lib/lua/$(LUAV)
 LDIR_linux?=share/lua/$(LUAV)
@@ -174,8 +174,7 @@ SO_linux=so
 O_linux=o
 CC_linux=gcc
 DEF_linux=-DLUASOCKET_$(DEBUG)
-CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
-	-Wimplicit -O2 -g
+CFLAGS_linux=-g -O2 -Wall -Wpedantic -Wshadow -Wextra -Wimplicit $(LUAINC:%=-I%) $(DEF)
 LDFLAGS_linux= -o
 LD_linux=ld
 SOCKET_linux=usocket.o
@@ -286,8 +285,8 @@ CC=$(CC_$(PLAT))
 DEF=$(DEF_$(PLAT))
 AR= ar rc
 RANLIB= ranlib
-CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
-LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
+CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
+LDFLAGS=$(LDFLAGS_$(PLAT)) $(MYLDFLAGS)
 LD=$(LD_$(PLAT))
 LUAINC= $(LUAINC_$(PLAT))
 LUALIB= $(LUALIB_$(PLAT))
>45a26b11 ^
9e679a03 ^
45a26b11 ^

30b5f112 ^
71679a31 ^

45a26b11 ^


45a26b11 ^
30b5f112 ^
2f82f50a ^
86c1c388 ^
1a3dc91e ^
45a26b11 ^

30b5f112 ^
fbc30231 ^

















cd2458c0 ^

0ae975c2 ^

b21edfaa ^
cd2458c0 ^
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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79