diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-13 12:00:57 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-08-27 13:51:18 -0700 |
| commit | 472aa2f4d22018c9ca668553d749df609b0dba5a (patch) | |
| tree | 090d7c9f111e665f1beecfb782f93b6506712b3a | |
| parent | 61b25d83fec2d07a01d0fb1f5bdbc1bc71ee652a (diff) | |
sdksyms.sh: Use CPPFLAGS, not CFLAGS
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>
(cherry picked from commit 290d366d4c6b6e051f0e337a1a6ee76f42d28003)
| -rw-r--r-- | hw/xfree86/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 391b26eb8..8c69b1b28 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -38,7 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ bin_PROGRAMS = Xorg nodist_Xorg_SOURCES = sdksyms.c -AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ +AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \ -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac @@ -109,7 +109,7 @@ CLEANFILES = sdksyms.c sdksyms.dep EXTRA_DIST += sdksyms.sh sdksyms.dep sdksyms.c: sdksyms.sh - CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(INCLUDES) + CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) SDKSYMS_DEP = sdksyms.dep include $(SDKSYMS_DEP) |