Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mkdir with spaces bug. change target directory based on debug and target platform. remove version variable and its one usage in target directory.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13997 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Andrew Bachmann 2005-08-20 19:54:37 +00:00
parent 61aceefd6e
commit 200c6baf88
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Jamrules
View File

@ -138,7 +138,6 @@ if $(BONE_COMPATIBLE) {
# Cross compiling can come later # Cross compiling can come later
TARGET_CPU ?= $(OSPLAT:L) ; TARGET_CPU ?= $(OSPLAT:L) ;
OBOS_VERSION ?= R1 ;
switch $(TARGET_CPU) { switch $(TARGET_CPU) {
case ppc : case ppc :
@ -163,11 +162,23 @@ switch $(TARGET_CPU) {
Exit "Currently unsupported build platform:" $(TARGET_CPU) ; Exit "Currently unsupported build platform:" $(TARGET_CPU) ;
} }
# We might later want to introduce debug levels or handle the whole issue
# differently. For now there's only on or off.
#
DEBUG ?= 0 ;
if $(DEBUG) != 0 {
OPTIM ?= -O0 ;
TARGET_DEBUG ?= debug_$(DEBUG) ;
} else {
OPTIM ?= -O2 ;
TARGET_DEBUG ?= release ;
}
# set target specific variables # set target specific variables
{ {
#Echo "Building for" $(TARGET_CPU) ; #Echo "Building for" $(TARGET_CPU) ;
OBOS_TARGET ?= $(TARGET_CPU).$(OBOS_VERSION) ; OBOS_TARGET ?= $(TARGET_CPU).$(TARGET_DEBUG).$(TARGET_PLATFORM) ;
OBOS_TARGET_TYPE ?= "application/x-vnd.Be-elfexecutable" ; OBOS_TARGET_TYPE ?= "application/x-vnd.Be-elfexecutable" ;
OBOS_ARCH ?= $(TARGET_CPU) ; OBOS_ARCH ?= $(TARGET_CPU) ;
OBOS_TARGET_DEFINE ?= "ARCH_"$(TARGET_CPU) ; OBOS_TARGET_DEFINE ?= "ARCH_"$(TARGET_CPU) ;
@ -204,23 +215,24 @@ KERNEL_C++FLAGS += -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
if $(GCC_VERSION[1]) >= 3 { if $(GCC_VERSION[1]) >= 3 {
KERNEL_C++FLAGS += -fno-use-cxa-atexit ; KERNEL_C++FLAGS += -fno-use-cxa-atexit ;
} }
DEBUG_FLAGS ?= -g ; DEBUG_FLAGS ?= -g ;
# We might later want to introduce debug levels or handle the whole issue
# differently. For now there's only on or off.
#
DEBUG ?= 0 ;
if $(DEBUG) != 0 { if $(DEBUG) != 0 {
OPTIM ?= -O0 ;
CCFLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ; CCFLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
C++FLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ; C++FLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
KERNEL_CCFLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ; KERNEL_CCFLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
KERNEL_C++FLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ; KERNEL_C++FLAGS += $(DEBUG_FLAGS) [ FDefines DEBUG=$(DEBUG) ] ;
LINKFLAGS += $(DEBUG_FLAGS) ; LINKFLAGS += $(DEBUG_FLAGS) ;
} else {
OPTIM ?= -O2 ;
} }
# define NDEBUG to a non-zero value to suppress asserts
NDEBUG ?= 0 ;
if $(NDEBUG) != 0 {
CCFLAGS += [ FDefines NDEBUG=$(NDEBUG) ] ;
C++FLAGS += [ FDefines NDEBUG=$(NDEBUG) ] ;
KERNEL_CCFLAGS += [ FDefines NDEBUG=$(NDEBUG) ] ;
KERNEL_C++FLAGS += [ FDefines NDEBUG=$(NDEBUG) ] ;
}
# #
# To disable for the tests OPTIM and DEBUG are overridden, set the environment # To disable for the tests OPTIM and DEBUG are overridden, set the environment
# variable NO_TEST_DEBUG. # variable NO_TEST_DEBUG.
@ -385,6 +397,11 @@ rule MakeLocate
} }
} }
actions MkDir1
{
$(MKDIR) "$(<)"
}
rule Object rule Object
{ {
# This is basically the original Jambase 2.4 Object rule stripped by # This is basically the original Jambase 2.4 Object rule stripped by