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

Fix issues with generation of mbr.bin for gcc4 & anyboot targets

Browse Source
This commit is contained in:
Jessica Hamilton
2014-09-10 22:47:32 +12:00
parent e547662664
commit 219f6c904a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/AnybootImage
Regular → Executable
+1 -1
View File
@@ -33,7 +33,7 @@ actions BuildAnybootImage1 {
} }
local baseMBR = base_mbr.bin ; local baseMBR = base_mbr.bin ;
local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.S ] ; local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.nasm ] ;
BuildAnybootMBR $(baseMBR) : $(mbrSource) ; BuildAnybootMBR $(baseMBR) : $(mbrSource) ;
MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ; MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ;
MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ; MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ;
src/bin/writembr/Jamfile
+1 -1
View File
@@ -10,7 +10,7 @@ Application writembr :
# Assemble the MBR code, and convert it into a header file # Assemble the MBR code, and convert it into a header file
NASMFLAGS on [ FGristFiles mbr.bin ] = -f bin -O5 ; NASMFLAGS on [ FGristFiles mbr.bin ] = -f bin -O5 -dMBR_CODE_ONLY=1 ;
Object [ FGristFiles mbr.bin ] : mbr.nasm ; Object [ FGristFiles mbr.bin ] : mbr.nasm ;