diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-14 10:27:41 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-14 10:27:41 -0600 |
| commit | a507db9599599ce33007b524276a6ea88e521662 (patch) | |
| tree | 67814f2b130fca2bcff7d75983ca5f94080b42db | |
| parent | b55160c3d9b38c5d481ceccc30e397430f26fe92 (diff) | |
| parent | f9943cd58f8a053172aa701d79da512ccd10d758 (diff) | |
| download | qemu-a507db9599599ce33007b524276a6ea88e521662.tar.gz | |
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -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) @@ -239,8 +239,10 @@ for opt do --cpu=*) cpu="$optarg" ;; --extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS" + EXTRA_CFLAGS="$optarg" ;; --extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS" + EXTRA_LDFLAGS="$optarg" ;; --enable-debug-info) debug_info="yes" ;; @@ -3334,6 +3336,8 @@ echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "qemu_docdir=$qemu_docdir" >> $config_host_mak echo "qemu_localstatedir=$local_statedir" >> $config_host_mak echo "qemu_helperdir=$libexecdir" >> $config_host_mak +echo "extra_cflags=$EXTRA_CFLAGS" >> $config_host_mak +echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak echo "ARCH=$ARCH" >> $config_host_mak if test "$debug_tcg" = "yes" ; then |