aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-14 10:27:41 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-14 10:27:41 -0600
commita507db9599599ce33007b524276a6ea88e521662 (patch)
tree67814f2b130fca2bcff7d75983ca5f94080b42db /Makefile
parentb55160c3d9b38c5d481ceccc30e397430f26fe92 (diff)
parentf9943cd58f8a053172aa701d79da512ccd10d758 (diff)
Merge remote-tracking branch 'kraxel/pixman.v6' into staging
* kraxel/pixman.v6: pixman: pass extra cflags and ldflags Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2b737d57b7..7622a4cfa4 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ subdir-pixman: pixman/Makefile
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)
pixman/Makefile: $(SRC_PATH)/pixman/configure
- (cd pixman; CFLAGS="$(CFLAGS) -fPIC" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)
+ (cd pixman; CFLAGS="$(CFLAGS) -fPIC $(extra_cflags) $(extra_ldflags)" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)
$(SRC_PATH)/pixman/configure:
(cd $(SRC_PATH)/pixman; autoreconf -v --install)