Skip to content

x86: fix undefined HAVE_X86ASM macro #1213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

x86: fix undefined HAVE_X86ASM macro #1213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions x86/Build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,15 @@ i686-assert = __i686__
configs += x86_64
x86_64-assert = __x86_64__

#configs += x86asm
#x86asm-assert = __i686__ || __x86_64__
#x86asm-deps = nasm

have_x86asm = $(and $(have_nasm),$(or $(have_i686),$(have_x86_64)))
configs += x86asm
x86asm-disabled = $(if $(and $(have_nasm),$(or $(have_i686),$(have_x86_64))),,y)

nasmflags = -f $(if $(have_apple),macho,elf)$(if $(have_x86_64),64,32) \
$(if $(have_apple),-DPREFIX) $(if $(have_pic),-DPIC) \
-Pconfig.asm -Ix86 -I$(top_srcdir)/x86

distfiles = config.asm.in x86inc.asm x86util.asm
genfiles = config.asm
#genfiles = $(if $(have_x86asm),config.asm)
genfiles = $(if $(have_x86asm),config.asm)

ARCH_X86_64 = $(if $(have_x86_64),1,0)

Expand Down
Loading