From 8636b3a4a54d00d4a45d61bdaffb31dfd0283142 Mon Sep 17 00:00:00 2001 From: Leorize Date: Thu, 23 Jan 2020 12:13:55 -0600 Subject: Makefile.in: use iquote for include paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The -I flag used causes gcc to pick headers from NASM instead of system headers for system includes. Since NASM have headers with names overlapping with the ones in the C standard library (ie. float.h). This breaks compilation on certain systems (ie. Haiku). This commit swap out the -I flags for -iquote, to only prioritise NASM include paths for quoted includes. Signed-off-by: Hiếu Lê diff --git a/Makefile.in b/Makefile.in index 32ef3d9..330a7e7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,12 +22,12 @@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ BUILD_CFLAGS = $(CPPFLAGS) $(CFLAGS) @DEFS@ -INTERNAL_CFLAGS = -I$(srcdir) -I$(objdir) \ - -I$(srcdir)/include -I$(objdir)/include \ - -I$(srcdir)/x86 -I$(objdir)/x86 \ - -I$(srcdir)/asm -I$(objdir)/asm \ - -I$(srcdir)/disasm -I$(objdir)/disasm \ - -I$(srcdir)/output -I$(objdir)/output +INTERNAL_CFLAGS = -iquote$(srcdir) -iquote$(objdir) \ + -iquote$(srcdir)/include -iquote$(objdir)/include \ + -iquote$(srcdir)/x86 -iquote$(objdir)/x86 \ + -iquote$(srcdir)/asm -iquote$(objdir)/asm \ + -iquote$(srcdir)/disasm -iquote$(objdir)/disasm \ + -iquote$(srcdir)/output -iquote$(objdir)/output ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS) LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -- 2.24.1