diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:48:19 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:48:19 -0500 |
| commit | d66961ab59a59cc5684a8e59c7e581bd07978010 (patch) | |
| tree | df0a04ded9370a9c80179fb53995ce6772dbad3e /build | |
| parent | a6e924672c45dc9253c63b1aee5f40c23c6ee4bb (diff) | |
| parent | 3f5b7864df62674298e5c8cd2a5061f2af75ac03 (diff) | |
Merge branch 'patch/cross-compile-ar' of github.com:asterisk/pjproject
Diffstat (limited to 'build')
| -rw-r--r-- | build/cc-auto.mak.in | 1 | ||||
| -rw-r--r-- | build/rules.mak | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/cc-auto.mak.in b/build/cc-auto.mak.in index bc56567..2530e21 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 0d35c56..15ae667 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) |