about summary refs log tree commit diff stats
path: root/src/luasocket
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/luasocket
parent3b4d7131cbe4615b24d96e2b053b8b38cafd6fd8 (diff)
downloadteliva-ef680411370a5f999b0127f6cad1a8db6fcc2dd7.tar.gz
standardize CFLAGS in luasocket
Diffstat (limited to 'src/luasocket')
-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))
'n176' href='#n176'>176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220