diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2010-05-17 13:07:39 +0000 |
| commit | 3fb7b207726aa7500b761c7056f7dbf82ac5015d (patch) | |
| tree | ca9641fb466f01651cbbd8d619fa6da5fac32976 /build | |
| parent | 49aea0237b6e2134fe31c551f21e8148c884e140 (diff) | |
Merge #1050, #1052, #1053, #1054 into the main trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3175 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build')
| -rw-r--r-- | build/cc-auto.mak.in | 21 | ||||
| -rw-r--r-- | build/common.mak | 9 | ||||
| -rw-r--r-- | build/rules.mak | 3 |
3 files changed, 33 insertions, 0 deletions
diff --git a/build/cc-auto.mak.in b/build/cc-auto.mak.in new file mode 100644 index 00000000..bc565672 --- /dev/null +++ b/build/cc-auto.mak.in @@ -0,0 +1,21 @@ +export CC = @CC@ -c +export CXX = @CXX@ -c +export AR = @AR@ +export LD = @LD@ +export LDOUT = -o +export RANLIB = @RANLIB@ + +export OBJEXT := .@OBJEXT@ +export LIBEXT := .@LIBEXT@ +export LIBEXT2 := @LIBEXT2@ + +export CC_OUT := @CC_OUT@ +export CC_INC := @CC_INC@ +export CC_DEF := @CC_DEF@ +export CC_OPTIMIZE := @CC_OPTIMIZE@ +export CC_LIB := -l + +export CC_SOURCES := +export CC_CFLAGS := @CC_CFLAGS@ +export CC_LDFLAGS := + diff --git a/build/common.mak b/build/common.mak index d6000078..ad6df03e 100644 --- a/build/common.mak +++ b/build/common.mak @@ -17,6 +17,15 @@ include $(PJDIR)/build/cc-$(CC_NAME).mak -include cc-$(CC_NAME).mak # +# Include auto configured compiler specification. +# This will override the compiler settings above. +# Currently this is made OPTIONAL, to prevent people +# from getting errors because they don't re-run ./configure +# after downloading new PJSIP. +# +-include $(PJDIR)/build/cc-auto.mak + +# # Include global machine specific definitions # include $(PJDIR)/build/m-$(MACHINE_NAME).mak diff --git a/build/rules.mak b/build/rules.mak index bbe0ab19..3afdfd47 100644 --- a/build/rules.mak +++ b/build/rules.mak @@ -65,6 +65,9 @@ print_common: @echo $(APP)_CXXFLAGS=$($(APP)_CXXFLAGS) @echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS) @echo DEPFLAGS=$(DEPFLAGS) + @echo CC=$(CC) + @echo AR=$(AR) + @echo RANLIB=$(RANLIB) print_bin: print_common @echo EXE=$(EXE) |