aboutsummaryrefslogtreecommitdiff
blob: 179a9da3ef979e8bffc9c59a28993fb91ea88dc5 (plain)
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
Get AR and ARFLAGS from configure.
https://bugs.gentoo.org/436758
http://debbugs.gnu.org/12549

--- emacs-24.2-orig/lwlib/Makefile.in
+++ emacs-24.2/lwlib/Makefile.in
@@ -37,7 +37,8 @@
 CPPFLAGS=@CPPFLAGS@
 RANLIB=@RANLIB@
 
-AR = ar cq
+AR = @AR@
+ARFLAGS = @ARFLAGS@
 
 LUCID_OBJS = lwlib-Xlw.o xlwmenu.o lwlib-Xaw.o
 MOTIF_OBJS = lwlib-Xm.o
@@ -65,7 +66,7 @@
 
 liblw.a: $(OBJS)
 	rm -f $@
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 ## Generated files in ../src, non-generated in $(srcdir)/../src.
--- emacs-24.2-orig/oldXMenu/Makefile.in
+++ emacs-24.2/oldXMenu/Makefile.in
@@ -57,8 +57,8 @@
 TAGS = etags
 RM = rm -f
 RANLIB = @RANLIB@
-# Solaris 2.1 ar doesn't accept the 'l' option.
-AR = ar cq
+AR = @AR@
+ARFLAGS = @ARFLAGS@
 
 OBJS =  Activate.o \
 	AddPane.o \
@@ -98,7 +98,7 @@
 
 libXMenu11.a: $(OBJS) $(EXTRA)
 	$(RM) $@
-	$(AR) $@ $(OBJS) $(EXTRA)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
 	$(RANLIB) $@
 
 Activate.o: Activate.c XMenuInt.h XMenu.h X10.h