diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 17:12:52 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 17:12:52 +0000 |
| commit | cbcfb964e8297f231e4424f52e0b376e6acdf6c6 (patch) | |
| tree | 1b098418aadefeb965d26d1591b9aca99455c06c | |
| parent | 4d7555f78e5a7df29a6fcb489c512f84750808c1 (diff) | |
People report bugs about Asterisk crashing with DO_CRASH enabled was getting a little silly...
Now we only show certain cflags when you run configure with --enable-dev-mode
(corresponding menuselect change to follow)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@109973 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | build_tools/cflags-devmode.xml | 17 | ||||
| -rw-r--r-- | build_tools/cflags.xml | 19 |
3 files changed, 23 insertions, 18 deletions
@@ -756,7 +756,7 @@ menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_cu menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent" -menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure +menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure @echo "Generating input for menuselect ..." @echo "<?xml version=\"1.0\"?>" > $@ @echo >> $@ @@ -764,6 +764,9 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done @cat build_tools/cflags.xml >> $@ + @if [ "${AST_DEVMODE}" = "yes" ]; then \ + cat build_tools/cflags-devmode.xml >> $@; \ + fi @cat build_tools/embed_modules.xml >> $@ @cat sounds/sounds.xml >> $@ @echo "</menu>" >> $@ diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml new file mode 100644 index 000000000..8be92e71f --- /dev/null +++ b/build_tools/cflags-devmode.xml @@ -0,0 +1,17 @@ + <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development"> + <member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output"> + </member> + <member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging"> + </member> + <member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks"> + <depend>DEBUG_THREADS</depend> + </member> + <member name="DO_CRASH" displayname="Crash on fatal errors"> + </member> + <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging"> + </member> + <member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters"> + </member> + <member name="TRACE_FRAMES" displayname="Trace Frame Allocations"> + </member> + </category> diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml index ccbabd035..db140d6aa 100644 --- a/build_tools/cflags.xml +++ b/build_tools/cflags.xml @@ -1,31 +1,16 @@ <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean"> - <member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking"> + <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler"> </member> - <member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output"> + <member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking"> </member> <member name="DEBUG_THREADS" displayname="Enable Thread Debugging"> </member> - <member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging"> - </member> - <member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks"> - <depend>DEBUG_THREADS</depend> - </member> - <member name="DO_CRASH" displayname="Crash on fatal errors"> - </member> - <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler"> - </member> - <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging"> - </member> <member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage"> </member> <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations"> </member> - <member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters"> - </member> <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications"> </member> - <member name="TRACE_FRAMES" displayname="Trace Frame Allocations"> - </member> <member name="STATIC_BUILD" displayname="Build static binaries"> </member> <member name="LOADABLE_MODULES" displayname="Runtime module loading"> |