summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2013-10-21 07:52:35 +0000
committerLiong Sauw Ming <ming@teluu.com>2013-10-21 07:52:35 +0000
commit82d7bc005cb72020e09438dab4fcfbe0969259a5 (patch)
tree2c8c7081e4f2b5059620374c9765d780b64455e8 /build
parent7b4f6389ccc9d6846fc4ca528108eaff342b3292 (diff)
Re #1630 (misc): Thanks to Mark Michelson for the patch
This changes the autoconfigure script to use different checks for ar and ranlib. The previous methods were causing compilation failures since it may cause a non-existent "ccar" command to be run. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4628 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build')
-rw-r--r--build/cc-auto.mak.in1
-rw-r--r--build/rules.mak3
2 files changed, 3 insertions, 1 deletions
diff --git a/build/cc-auto.mak.in b/build/cc-auto.mak.in
index bc565672..2530e210 100644
--- a/build/cc-auto.mak.in
+++ b/build/cc-auto.mak.in
@@ -1,6 +1,7 @@
export CC = @CC@ -c
export CXX = @CXX@ -c
export AR = @AR@
+export AR_FLAGS = @AR_FLAGS@
export LD = @LD@
export LDOUT = -o
export RANLIB = @RANLIB@
diff --git a/build/rules.mak b/build/rules.mak
index 0d35c56f..15ae6672 100644
--- a/build/rules.mak
+++ b/build/rules.mak
@@ -72,6 +72,7 @@ print_common:
@echo DEPFLAGS=$(DEPFLAGS)
@echo CC=$(CC)
@echo AR=$(AR)
+ @echo AR_FLAGS=$(AR_FLAGS)
@echo RANLIB=$(RANLIB)
print_bin: print_common
@@ -84,7 +85,7 @@ print_lib: print_common
$(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
- $(AR) $(LIB) $(OBJS)
+ $(AR) $(AR_FLAGS) $(LIB) $(OBJS)
$(RANLIB) $(LIB)
$(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)