From 7705558b3e119ee46ed57aef7f4340a484fc38b7 Mon Sep 17 00:00:00 2001
From: Bart Oldeman <bart@dosemu.org>
Date: Thu, 21 Dec 2017 12:40:34 -0500
Subject: [PATCH] Use "ar" instead of "wlib" in gcc build.

---
 drivers/makefile | 4 ++--
 mkfiles/gcc.mak  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/makefile b/drivers/makefile
index e53c916..22a68f7 100644
--- a/drivers/makefile
+++ b/drivers/makefile
@@ -24,7 +24,7 @@
 
 OBJS   = floppy.obj rdpcclk.obj wrpcclk.obj wratclk.obj
 
-LIBOBJS= +floppy.obj +rdpcclk.obj +wrpcclk.obj +wratclk.obj
+LIBOBJS= $(LIBPLUS)floppy.obj $(LIBPLUS)rdpcclk.obj $(LIBPLUS)wrpcclk.obj $(LIBPLUS)wratclk.obj
 
 
 
@@ -45,5 +45,5 @@ clean:
 
 device.lib : $(OBJS)
 	-$(RM) device.lib
-	$(LIBUTIL) $(LIBFLAGS) device $(LIBOBJS) $(LIBTERM)
+	$(LIBUTIL) $(LIBFLAGS) device.lib $(LIBOBJS) $(LIBTERM)
 
diff --git a/mkfiles/gcc.mak b/mkfiles/gcc.mak
index 3b4414d..bbc4d8b 100644
--- a/mkfiles/gcc.mak
+++ b/mkfiles/gcc.mak
@@ -12,7 +12,7 @@ TARGETOPT=-march=i8086
 !endif
 !endif
 
-LIBUTIL=wlib -q
+LIBUTIL=ar crs
 LIBPLUS=
 LIBTERM=