diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-10-21 10:55:42 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-10-21 11:44:31 +0200 |
| commit | 424c1a9bb52aedbff0026ab4a9cce16f972235f0 (patch) | |
| tree | 1292c1d967e7f08a9772aca8645a71e30172f845 | |
| parent | 63c7efeb3b31d276bc04e11ba6a7488da9232e41 (diff) | |
| download | ptxdist-424c1a9bb52aedbff0026ab4a9cce16f972235f0.tar.gz ptxdist-424c1a9bb52aedbff0026ab4a9cce16f972235f0.tar.xz | |
wrapper: add PTXDIST_CROSS_CPPFLAGS late
These are only the -isystem arguments for sysroot. They should be added at
the end of the commandline. This way any other -isystem generated by the
package build system has priority.
This fixes building Qt5 packages if Qt4 is installed as well. For Q55 qmake
produces '-isystem <sysroot>/usr/include/qt5'. Without this the Qt4 headers
in <sysroot>/usr/include are used.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/wrapper/libwrapper.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/wrapper/libwrapper.sh b/scripts/wrapper/libwrapper.sh index 113825e8d..330332448 100644 --- a/scripts/wrapper/libwrapper.sh +++ b/scripts/wrapper/libwrapper.sh @@ -196,7 +196,7 @@ cc_add_arch() { cpp_add_target_extra() { add_opt_arg TARGET_COMPILER_RECORD_SWITCHES "-frecord-gcc-switches" - add_arg ${PTXDIST_CROSS_CPPFLAGS} + add_late_arg ${PTXDIST_CROSS_CPPFLAGS} add_arg ${pkg_cppflags} add_opt_arg TARGET_EXTRA_CPPFLAGS ${PTXCONF_TARGET_EXTRA_CPPFLAGS} } |