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

Sorry, my last commit was incomplete

Browse Source
This commit is contained in:
Jonathan Schleifer
2014-03-29 02:29:52 +01:00
parent 5bd5f161e8
commit d6f8092732
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MainBuildRules
+2 -2
View File
@@ -175,9 +175,9 @@ rule AssembleNasm
actions AssembleNasm actions AssembleNasm
{ {
if test $(ASFLAGS) ; then if test $(ASFLAGS) ; then
$(HAIKU_YASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2); $(HAIKU_NASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2);
else else
$(HAIKU_YASM) -f elf32 -o $(1) $(2); $(HAIKU_NASM) -f elf32 -o $(1) $(2);
fi fi
} }
build/jam/images/AnybootImage
+1 -1
View File
@@ -14,7 +14,7 @@ rule BuildAnybootMBR binary : source {
actions BuildAnybootMBR1 { actions BuildAnybootMBR1 {
$(RM) $(1) $(RM) $(1)
$(HAIKU_YASM) -f bin $(MBR_SOURCE) -O5 -o $(1) $(HAIKU_NASM) -f bin $(MBR_SOURCE) -O5 -o $(1)
} }
rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile { rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile {
configure
Vendored
+2 -2
View File
@@ -687,7 +687,7 @@ if [ "$HAIKU_HOST_BUILD_ONLY" = 1 ]; then
HAIKU_OBJCOPY=$invalidCommand HAIKU_OBJCOPY=$invalidCommand
HAIKU_RANLIB=$invalidCommand HAIKU_RANLIB=$invalidCommand
HAIKU_ELFEDIT=$invalidCommand HAIKU_ELFEDIT=$invalidCommand
HAIKU_YASM=$invalidCommand HAIKU_NASM=$invalidCommand
HAIKU_STRIP=$invalidCommand HAIKU_STRIP=$invalidCommand
else else
if [ -n "$HAIKU_PACKAGING_ARCHS" ]; then if [ -n "$HAIKU_PACKAGING_ARCHS" ]; then
@@ -874,7 +874,7 @@ HAIKU_PACKAGING_ARCHS ?= ${HAIKU_PACKAGING_ARCHS} ;
HAIKU_BUILD_ATTRIBUTES_DIR ?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ; HAIKU_BUILD_ATTRIBUTES_DIR ?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
HAIKU_YASM ?= ${HAIKU_YASM} ; HAIKU_NASM ?= ${HAIKU_NASM} ;
HOST_EXTENDED_REGEX_SED ?= ${HOST_EXTENDED_REGEX_SED} ; HOST_EXTENDED_REGEX_SED ?= ${HOST_EXTENDED_REGEX_SED} ;
HOST_GCC_RAW_VERSION ?= ${HOST_GCC_RAW_VERSION} ; HOST_GCC_RAW_VERSION ?= ${HOST_GCC_RAW_VERSION} ;
src/apps/bootmanager/Jamfile
+4 -4
View File
@@ -31,19 +31,19 @@ DoCatalogs BootManager : x-vnd.Haiku-BootManager : $(cataloguedSources) ;
# Assemble the boot loader, and convert it into a header file # Assemble the boot loader, and convert it into a header file
# TODO: should be merged with the AssembleNasm rule # TODO: should be merged with the AssembleNasm rule
rule AssembleYasmBin object : source rule AssembleNasmBin object : source
{ {
SEARCH on $(source) = $(SUBDIR) ; SEARCH on $(source) = $(SUBDIR) ;
MakeLocateDebug $(object) ; MakeLocateDebug $(object) ;
Depends $(object) : $(source) ; Depends $(object) : $(source) ;
} }
actions AssembleYasmBin actions AssembleNasmBin
{ {
$(HAIKU_YASM) -f bin -o $(1) $(2) $(HAIKU_NASM) -f bin -o $(1) $(2)
} }
AssembleYasmBin [ FGristFiles bootman.bin ] : bootman.S ; AssembleNasmBin [ FGristFiles bootman.bin ] : bootman.S ;
DataFileToSourceFile [ FGristFiles BootLoader.h ] : [ FGristFiles bootman.bin ] DataFileToSourceFile [ FGristFiles BootLoader.h ] : [ FGristFiles bootman.bin ]
: kBootLoader : kBootLoaderSize ; : kBootLoader : kBootLoaderSize ;
src/bin/writembr/Jamfile
+4 -4
View File
@@ -10,19 +10,19 @@ Application writembr :
# Assemble the MBR code, and convert it into a header file # Assemble the MBR code, and convert it into a header file
rule AssembleYasmBin object : source rule AssembleNasmBin object : source
{ {
SEARCH on $(source) = $(SUBDIR) ; SEARCH on $(source) = $(SUBDIR) ;
MakeLocateDebug $(object) ; MakeLocateDebug $(object) ;
Depends $(object) : $(source) ; Depends $(object) : $(source) ;
} }
actions AssembleYasmBin actions AssembleNasmBin
{ {
$(HAIKU_YASM) -f bin -O5 -o $(1) $(2) $(HAIKU_NASM) -f bin -O5 -o $(1) $(2)
} }
AssembleYasmBin [ FGristFiles mbr.bin ] : mbr.S ; AssembleNasmBin [ FGristFiles mbr.bin ] : mbr.S ;
DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ] DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ]
: kMBR : kMBRSize ; : kMBR : kMBRSize ;