2015-06-26 05:44:34 +01:00
|
|
|
From 91971455ee46b1059de75260ef0d1a45170d8b65 Mon Sep 17 00:00:00 2001
|
2014-08-13 01:40:57 +01:00
|
|
|
From: Jeremy Huddleston <jeremyhu@apple.com>
|
|
|
|
|
Date: Fri, 13 Jan 2012 12:00:57 -0800
|
2015-06-26 05:44:34 +01:00
|
|
|
Subject: [PATCH 2/6] sdksyms.sh: Use CPPFLAGS, not CFLAGS
|
2014-08-13 01:40:57 +01:00
|
|
|
|
|
|
|
|
CFLAGS can include flags which are not useful to the preprocessor
|
|
|
|
|
or can even cause it to fail. This fixes a build issue on darwin
|
|
|
|
|
when building for more than one architecture.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
|
|
|
Reviewed-by: Keith Packard <keithp@keithp.com>
|
|
|
|
|
---
|
2015-06-26 05:44:34 +01:00
|
|
|
hw/xfree86/Makefile.am | 5 ++---
|
|
|
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
2014-08-13 01:40:57 +01:00
|
|
|
|
|
|
|
|
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
|
2015-06-26 05:44:34 +01:00
|
|
|
index 27f2cc6..d898c43 100644
|
2014-08-13 01:40:57 +01:00
|
|
|
--- a/hw/xfree86/Makefile.am
|
|
|
|
|
+++ b/hw/xfree86/Makefile.am
|
2015-06-26 05:44:34 +01:00
|
|
|
@@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
|
2014-08-13 01:40:57 +01:00
|
|
|
bin_PROGRAMS = Xorg
|
|
|
|
|
nodist_Xorg_SOURCES = sdksyms.c
|
|
|
|
|
|
|
|
|
|
-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
2015-06-26 05:44:34 +01:00
|
|
|
-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
|
|
|
|
|
+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
|
2014-08-13 01:40:57 +01:00
|
|
|
-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
|
2015-06-26 05:44:34 +01:00
|
|
|
-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
|
|
|
|
|
|
|
|
|
|
@@ -135,7 +134,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
|
2014-08-13 01:40:57 +01:00
|
|
|
EXTRA_DIST += sdksyms.sh
|
|
|
|
|
|
|
|
|
|
sdksyms.dep sdksyms.c: sdksyms.sh
|
2015-06-26 05:44:34 +01:00
|
|
|
- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
|
|
|
|
|
+ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
|
2014-08-13 01:40:57 +01:00
|
|
|
|
|
|
|
|
SDKSYMS_DEP = sdksyms.dep
|
2015-06-26 05:44:34 +01:00
|
|
|
-include $(SDKSYMS_DEP)
|
2014-08-13 01:40:57 +01:00
|
|
|
--
|
2015-06-26 05:44:34 +01:00
|
|
|
2.3.2 (Apple Git-55)
|
2014-08-13 01:40:57 +01:00
|
|
|
|
