[haiku-commits] Re: haiku: hrev47068 - src/apps/bootmanager src/bin/writembr build/jam build/jam/images
- From: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 29 Mar 2014 16:38:50 +1300
On 29 March 2014 14:53, <js-haiku-commits@xxxxxxxxxxx> wrote:
> diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
>
index ba98220..912a2f0 100644
> --- a/build/jam/MainBuildRules
> +++ b/build/jam/MainBuildRules
> @@ -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
> }
>
Now the ffmpeg add-on doesn't build, with errors of invalid operand type.
Tested with NASM 2.11 (OS X), 2.10 (Ubuntu).
Other related posts:
