summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralanminko <37236958+alanminko@users.noreply.github.com>2020-04-30 14:22:57 -0700
committerGitHub <noreply@github.com>2020-04-30 14:22:57 -0700
commit54763e6882fc88d12fadfcd7df1b40d52b8f9beb (patch)
treeaa76c1ccd56cf24ba6266c09aa1a53a4b864d4c9
parent8de27b691b86556e5fa5167f87b00399ff9e028e (diff)
parent128ba6ebc5ec210cd9660f3f032f9a555dc79ec6 (diff)
downloadabc-54763e6882fc88d12fadfcd7df1b40d52b8f9beb.tar.gz
abc-54763e6882fc88d12fadfcd7df1b40d52b8f9beb.tar.bz2
abc-54763e6882fc88d12fadfcd7df1b40d52b8f9beb.zip
Merge pull request #58 from whitequark/patch-2
Allow changing the `ar` binary
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e0e8b8f0..583bc25b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
CC := gcc
CXX := g++
+AR := ar
LD := $(CXX)
MSG_PREFIX ?=
@@ -8,6 +9,7 @@ ABCSRC = .
$(info $(MSG_PREFIX)Using CC=$(CC))
$(info $(MSG_PREFIX)Using CXX=$(CXX))
+$(info $(MSG_PREFIX)Using AR=$(AR))
$(info $(MSG_PREFIX)Using LD=$(LD))
PROG := abc
@@ -215,8 +217,7 @@ $(PROG): $(OBJ)
lib$(PROG).a: $(LIBOBJ)
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
- $(VERBOSE)ar rv $@ $?
- $(VERBOSE)ranlib $@
+ $(VERBOSE)$(AR) rsv $@ $?
lib$(PROG).so: $(LIBOBJ)
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)