From 0a3d8bdbf17d67b457cd41a569a9bccc6220c54d Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 18 Jul 2023 12:56:02 +1200 Subject: [PATCH] Change 'ar rcu' to 'ar cr' --- external/json/Makefile | 2 +- external/socket/src/makefile | 2 +- lua-5.4/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/external/json/Makefile b/external/json/Makefile index 7bfac18..f130098 100644 --- a/external/json/Makefile +++ b/external/json/Makefile @@ -12,7 +12,7 @@ ##### Build defaults ##### CC = cc -AR = ar rcu +AR = ar cr 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 diff --git a/external/socket/src/makefile b/external/socket/src/makefile index b016e7a..81cdbe7 100644 --- a/external/socket/src/makefile +++ b/external/socket/src/makefile @@ -28,7 +28,7 @@ DESTDIR?= #------ # Compiler and linker settings -AR = ar rcu +AR = ar cr CC = cc DEF = -DLUASOCKET_${DEBUG} INCS = -I../../../lua-5.4 diff --git a/lua-5.4/Makefile b/lua-5.4/Makefile index 7592356..d4defa0 100644 --- a/lua-5.4/Makefile +++ b/lua-5.4/Makefile @@ -11,7 +11,7 @@ CFLAGS= -O2 -fpic -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) -AR= ar rcu +AR= ar cr RANLIB= ranlib RM= rm -f UNAME= uname @@ -124,10 +124,10 @@ generic: $(ALL) Linux linux: 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: - $(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: $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" SYSLIBS="-lreadline"