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
{
if test $(ASFLAGS) ; then
$(HAIKU_YASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2);
$(HAIKU_NASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2);
else
$(HAIKU_YASM) -f elf32 -o $(1) $(2);
$(HAIKU_NASM) -f elf32 -o $(1) $(2);
fi
}
build/jam/images/AnybootImage
+1 -1
View File
@@ -14,7 +14,7 @@ rule BuildAnybootMBR binary : source {
actions BuildAnybootMBR1 {
$(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 {