summaryrefslogtreecommitdiff
path: root/res/pjproject/build/common.mak
diff options
context:
space:
mode:
Diffstat (limited to 'res/pjproject/build/common.mak')
-rw-r--r--res/pjproject/build/common.mak9
1 files changed, 9 insertions, 0 deletions
diff --git a/res/pjproject/build/common.mak b/res/pjproject/build/common.mak
index d6000078e..ad6df03e9 100644
--- a/res/pjproject/build/common.mak
+++ b/res/pjproject/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