i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New variable DEBUG_FLAGS which can be used to specify the gcc debug

Browse Source 
flags to be used. Defaults to -g. You might want to use -ggdb with
  gcc 3.x.
* Added variable C++_SUPPORT_LIBS. Is set to sup++ for gcc 3.x.
* ResComp can be built under BeOS only at the moment.
* Define _NO_INLINE_ASM when building for the build platform. Is not
  strictly necessary under BeOS, but helps under Linux.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11561 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-03-03 23:15:44 +00:00
parent a15b332e3b
commit 3844cf706a
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+33 -9
View File
@@ -202,17 +202,19 @@ if $(GCC_VERSION[1]) >= 3 {
KERNEL_C++FLAGS += -fno-use-cxa-atexit ; KERNEL_C++FLAGS += -fno-use-cxa-atexit ;
} }
DEBUG_FLAGS ?= -g ;
# We might later want to introduce debug levels or handle the whole issue # We might later want to introduce debug levels or handle the whole issue
# differently. For now there's only on or off. # differently. For now there's only on or off.
# #
DEBUG ?= 0 ; DEBUG ?= 0 ;
if $(DEBUG) != 0 { if $(DEBUG) != 0 {
OPTIM ?= -O0 ; OPTIM ?= -O0 ;
CCFLAGS += -g [ FDefines DEBUG=$(DEBUG) ] ; CCFLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
C++FLAGS += -g [ FDefines DEBUG=$(DEBUG) ] ; C++FLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
KERNEL_CCFLAGS += -g [ FDefines DEBUG=$(DEBUG) ] ; KERNEL_CCFLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
KERNEL_C++FLAGS += -g [ FDefines DEBUG=$(DEBUG) ] ; KERNEL_C++FLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
LINKFLAGS += -g ; LINKFLAGS += $(DEBUG_FLAGS) ;
} else { } else {
OPTIM ?= -O2 ; OPTIM ?= -O2 ;
} }
@@ -248,6 +250,13 @@ if $(OS) = BEOS {
BUILD_LIBSTDC++ = stdc++ ; BUILD_LIBSTDC++ = stdc++ ;
} }
if $(GCC_VERSION[1]) >= 3 {
C++_SUPPORT_LIBS = supc++ ;
} else {
C++_SUPPORT_LIBS = ;
}
# If no OBOS_OBJECT_TARGET is not defined yet, use our default directory and # If no OBOS_OBJECT_TARGET is not defined yet, use our default directory and
# include our "OBOS_TARGET" as subdirectory in there (to prevent different # include our "OBOS_TARGET" as subdirectory in there (to prevent different
# builds mixing objects from different targets). # builds mixing objects from different targets).
@@ -305,6 +314,8 @@ rule SetupIncludes
# Use headers directory, to allow to do things like include <posix/string.h> # Use headers directory, to allow to do things like include <posix/string.h>
HDRS = [ FDirName $(OBOS_TOP) headers ] ; HDRS = [ FDirName $(OBOS_TOP) headers ] ;
HDRS = [ FDirName $(OBOS_TOP) headers cpp ] ;
# Use posix headers directory # Use posix headers directory
HDRS += [ FDirName $(OBOS_TOP) headers posix ] ; HDRS += [ FDirName $(OBOS_TOP) headers posix ] ;
@@ -728,8 +739,8 @@ rule TestObjects
if ! $(NO_TEST_DEBUG) { if ! $(NO_TEST_DEBUG) {
# Turn debugging on. That is usually desired for test code. # Turn debugging on. That is usually desired for test code.
ObjectCcFlags $(objects) : "-g" ; ObjectCcFlags $(objects) : $(DEBUG_FLAGS) ;
ObjectC++Flags $(objects) : "-g" ; ObjectC++Flags $(objects) : $(DEBUG_FLAGS) ;
# Turn optimization on again. # Turn optimization on again.
OPTIM = $(optim) ; OPTIM = $(optim) ;
@@ -777,8 +788,8 @@ rule SimpleTest
ObjectsDefines $(sources) : TEST_OBOS ; ObjectsDefines $(sources) : TEST_OBOS ;
if ! $(NO_TEST_DEBUG) { if ! $(NO_TEST_DEBUG) {
# Turn debugging on. That is usually desired for test code. # Turn debugging on. That is usually desired for test code.
ObjectCcFlags $(sources) : "-g" ; ObjectCcFlags $(sources) : $(DEBUG_FLAGS) ;
ObjectC++Flags $(sources) : "-g" ; ObjectC++Flags $(sources) : $(DEBUG_FLAGS) ;
# Turn optimization on again. # Turn optimization on again.
OPTIM = $(optim) ; OPTIM = $(optim) ;
@@ -1035,6 +1046,8 @@ rule AddResources
} }
} }
if $(OS) = BEOS {
rule ResComp rule ResComp
{ {
# ResComp <resource file> : <rdef file> ; # ResComp <resource file> : <rdef file> ;
@@ -1050,6 +1063,14 @@ rule ResComp
ResComp1 $(1) : rc $(2) ; ResComp1 $(1) : rc $(2) ;
} }
} else {
rule ResComp
{
}
}
actions ResComp1 actions ResComp1
{ {
$(2[1]) -o $(1) $(2[2-]) $(2[1]) -o $(1) $(2[2-])
@@ -1922,6 +1943,9 @@ rule BuildPlatformMain
Main $(1) : $(2) ; Main $(1) : $(2) ;
ObjectsDefines $(2) : _NO_INLINE_ASM ;
# Be careful with find_thread() and the like.
# Reset CCFLAGS and C++FLAGS to original values. # Reset CCFLAGS and C++FLAGS to original values.
CCFLAGS = $(oldCCFLAGS) ; CCFLAGS = $(oldCCFLAGS) ;
C++FLAGS = $(oldC++FLAGS) ; C++FLAGS = $(oldC++FLAGS) ;