ref: e6e46f84f391b524fc2dda30d7a362e219d188f4
parent: 0f1371e4619529e85c50c1e9e903b535a0a0efc1
parent: 4c8347aa227f88cfd779f49ddcba011b278043ed
author: Ethan Hugg <ethanhugg@gmail.com>
date: Fri Jun 26 03:56:53 EDT 2015
Merge pull request #2011 from mstorsjo/fix-arflags Don't concatenate $@ to AR_OPTS
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
CCAS=$(CC)
CXX_O=-o $@
CXX_LINK_O=-o $@
-AR_OPTS=cr
+AR_OPTS=cr $@
LINK_LOCAL_DIR=-L.
LINK_LIB=-l$(1)
CFLAGS_OPT=-O3
@@ -70,7 +70,6 @@
CFLAGS += -DGENERATED_VERSION_HEADER
LDFLAGS +=
-AR_OPTS += $@
ifeq (Yes, $(GCOV))
CFLAGS += -fprofile-arcs -ftest-coverage
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -4,7 +4,7 @@
SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP
LDFLAGS += -lpthread
-AR_OPTS += -D
+AR_OPTS = crD $@
ifeq ($(ASM_ARCH), x86)
ifeq ($(ARCH), x86_64)
ASMFLAGS += -f elf64