configure does now check the yasm version for target architecture x86, and
sets the HAIKU_YASM build variable, which will be checked in BuildSetup. Re-running configure or adding the variable manually to generated/build/BuildConfig is required. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30145 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -180,6 +180,11 @@ switch $(HAIKU_CPU) {
|
||||
HAIKU_BOOT_PLATFORM = bios_ia32 ;
|
||||
# offset in floppy image (>= sizeof(haiku_loader))
|
||||
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
|
||||
|
||||
# yasm is required for target arch x86
|
||||
if ! $(HAIKU_YASM) {
|
||||
Exit "HAIKU_YASM not set. Please re-run configure." ;
|
||||
}
|
||||
}
|
||||
case m68k :
|
||||
{
|
||||
|
||||
@@ -175,9 +175,9 @@ rule AssembleNasm
|
||||
actions AssembleNasm
|
||||
{
|
||||
if test $(ASFLAGS) ; then
|
||||
yasm -d $(ASFLAGS) -f elf32 -o $(1) $(2);
|
||||
$(HAIKU_YASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2);
|
||||
else
|
||||
yasm -f elf32 -o $(1) $(2);
|
||||
$(HAIKU_YASM) -f elf32 -o $(1) $(2);
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user