diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-12-18 14:09:54 +0100 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-26 15:28:12 +0100 |
commit | 7280642561957ef7f7831e6e949336cf18ade41b (patch) | |
tree | f63adbb7c6dcf53d13ee5de2461f0bbf51388e52 | |
parent | d26f53471337091fde73e99961bb8690ae0090d5 (diff) | |
download | ptxdist-7280642561957ef7f7831e6e949336cf18ade41b.tar.gz ptxdist-7280642561957ef7f7831e6e949336cf18ade41b.tar.xz |
[qt4] ignore errors during 'make install'
some examples will fail to compile (and install) if some Qt libraries
are not built. The dependencies make sure that this only happens to not
selected examples.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Cherry-picked from master: 7daec666148054f321d0115b4a1f0d972a9a3521
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | rules/qt4.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/qt4.make b/rules/qt4.make index 6728f7579..53a5de3e5 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -58,7 +58,7 @@ $(STATEDIR)/qt4.extract: # don't use CROSS_ENV. Qt uses mkspecs for instead. QT4_ENV := $(CROSS_ENV_FLAGS) $(CROSS_ENV_PKG_CONFIG) QT4_PATH := PATH=$(CROSS_PATH) -QT4_INSTALL_OPT := INSTALL_ROOT=$(QT4_PKGDIR) +QT4_INSTALL_OPT := INSTALL_ROOT=$(QT4_PKGDIR) -i ifdef PTXCONF_ARCH_ARM_V6 QT4_ARCH = armv6 |