| 1 |
From b877aca8da4fec52875cbf03646ffad0ffd31ae1 Mon Sep 17 00:00:00 2001
|
| 2 |
From: Jeremy Huddleston <jeremyhu@apple.com>
|
| 3 |
Date: Fri, 13 Jan 2012 12:00:57 -0800
|
| 4 |
Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
|
| 5 |
|
| 6 |
CFLAGS can include flags which are not useful to the preprocessor
|
| 7 |
or can even cause it to fail. This fixes a build issue on darwin
|
| 8 |
when building for more than one architecture.
|
| 9 |
|
| 10 |
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
| 11 |
Reviewed-by: Keith Packard <keithp@keithp.com>
|
| 12 |
---
|
| 13 |
hw/xfree86/Makefile.am | 5 ++---
|
| 14 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
| 15 |
|
| 16 |
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
|
| 17 |
index 15670d0..b35e464 100644
|
| 18 |
--- a/hw/xfree86/Makefile.am
|
| 19 |
+++ b/hw/xfree86/Makefile.am
|
| 20 |
@@ -43,8 +43,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
|
| 21 |
bin_PROGRAMS = Xorg
|
| 22 |
nodist_Xorg_SOURCES = sdksyms.c
|
| 23 |
|
| 24 |
-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
| 25 |
-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
|
| 26 |
+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
|
| 27 |
-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
|
| 28 |
-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
|
| 29 |
|
| 30 |
@@ -118,7 +117,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
|
| 31 |
EXTRA_DIST += sdksyms.sh
|
| 32 |
|
| 33 |
sdksyms.dep sdksyms.c: sdksyms.sh
|
| 34 |
- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
|
| 35 |
+ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
|
| 36 |
|
| 37 |
SDKSYMS_DEP = sdksyms.dep
|
| 38 |
include $(SDKSYMS_DEP)
|
| 39 |
--
|
| 40 |
1.9.1
|
| 41 |
|
Parent Directory
| 
Revision Log