jeremy/callisto
1
Fork 0
Code Releases Activity

Change 'ar rcu' to 'ar cr'

Browse source
This commit is contained in:
Jeremy Baxter 2023-07-18 12:56:02 +12:00
parent 32ad743d61
commit 0a3d8bdbf1
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/json/Makefile vendored
View file

@ -12,7 +12,7 @@
##### Build defaults ##### ##### Build defaults #####
CC = cc CC = cc
AR = ar rcu AR = ar cr
CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../../lua-5.4 CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../../lua-5.4
OBJS = dtoa.o fpconv.o g_fmt.o lua_cjson.o strbuf.o OBJS = dtoa.o fpconv.o g_fmt.o lua_cjson.o strbuf.o

2
external/socket/src/makefile vendored
View file

@ -28,7 +28,7 @@ DESTDIR?=
#------ #------
# Compiler and linker settings # Compiler and linker settings
AR = ar rcu AR = ar cr
CC = cc CC = cc
DEF = -DLUASOCKET_${DEBUG} DEF = -DLUASOCKET_${DEBUG}
INCS = -I../../../lua-5.4 INCS = -I../../../lua-5.4

6
lua-5.4/Makefile
View file

@ -11,7 +11,7 @@ CFLAGS= -O2 -fpic -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS) LIBS= -lm $(SYSLIBS) $(MYLIBS)
AR= ar rcu AR= ar cr
RANLIB= ranlib RANLIB= ranlib
RM= rm -f RM= rm -f
UNAME= uname UNAME= uname
@ -124,10 +124,10 @@ generic: $(ALL)
Linux linux: linux-noreadline Linux linux: linux-noreadline
linux-noreadline: linux-noreadline:
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl" $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E"
linux-readline: linux-readline:
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE" SYSLIBS="-Wl,-E -ldl -lreadline" $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -DLUA_USE_READLINE" SYSLIBS="-Wl,-E -lreadline"
Darwin macos macosx: Darwin macos macosx:
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" SYSLIBS="-lreadline" $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" SYSLIBS="-lreadline"