diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-08 09:55:44 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-06-08 11:04:19 +0200 |
| commit | 026c08527ce46fe7036cd280b8bc2c2c2466e854 (patch) | |
| tree | 5d4ba66b8f4bc4302bb192e35f76c43ea0515f61 | |
| parent | 348d8071b3076a910d8dcde644f3136bfbcb98aa (diff) | |
| download | ptxdist-026c08527ce46fe7036cd280b8bc2c2c2466e854.tar.gz ptxdist-026c08527ce46fe7036cd280b8bc2c2c2466e854.tar.xz | |
introduce <PKG>_{CPPFLAGS,CFLAGS,CXXFLAGS,LDFLAGS}
The toolchain wrapper adds these package specific flags when appropriate.
They are added right before PTXCONF_TARGET_EXTRA_*
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/post/ptxd_make_world_common.make | 5 | ||||
| -rw-r--r-- | scripts/wrapper/libwrapper.sh | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make index df37e51cc..4820d8c16 100644 --- a/rules/post/ptxd_make_world_common.make +++ b/rules/post/ptxd_make_world_common.make @@ -77,6 +77,11 @@ world/env/impl = \ \ pkg_wrapper_blacklist="$(call ptx/escape,$($(1)_WRAPPER_BLACKLIST))" \ \ + pkg_cppflags="$(call ptx/escape,$($(1)_CPPFLAGS))" \ + pkg_cflags="$(call ptx/escape,$($(1)_CFLAGS))" \ + pkg_cxxflags="$(call ptx/escape,$($(1)_CXXFLAGS))" \ + pkg_ldflags="$(call ptx/escape,$($(1)_LDFLAGS))" \ + \ pkg_conf_tool="$(call ptx/escape,$($(1)_CONF_TOOL))" \ pkg_conf_env="$(call ptx/escape,$($(1)_CONF_ENV))" \ pkg_conf_opt="$(call ptx/escape,$($(1)_CONF_OPT))" \ diff --git a/scripts/wrapper/libwrapper.sh b/scripts/wrapper/libwrapper.sh index 3961b25d5..b574b3b83 100644 --- a/scripts/wrapper/libwrapper.sh +++ b/scripts/wrapper/libwrapper.sh @@ -138,6 +138,7 @@ cc_add_target_ld_args() { if ${LINKING}; then add_ld_args "-Wl," add_late_arg ${PTXDIST_CROSS_LDFLAGS} + add_arg ${pkg_ldflags} add_opt_arg TARGET_EXTRA_LDFLAGS ${PTXCONF_TARGET_EXTRA_LDFLAGS} fi } @@ -183,29 +184,35 @@ cc_add_debug() { cpp_add_target_extra() { add_opt_arg TARGET_COMPILER_RECORD_SWITCHES "-frecord-gcc-switches" add_arg ${PTXDIST_CROSS_CPPFLAGS} + add_arg ${pkg_cppflags} add_opt_arg TARGET_EXTRA_CPPFLAGS ${PTXCONF_TARGET_EXTRA_CPPFLAGS} } cc_add_target_extra() { cpp_add_target_extra cc_add_debug + add_arg ${pkg_cflags} add_opt_arg TARGET_EXTRA_CFLAGS ${PTXCONF_TARGET_EXTRA_CFLAGS} } cxx_add_target_extra() { cpp_add_target_extra cc_add_debug + add_arg ${pkg_cxxflags} add_opt_arg TARGET_EXTRA_CXXFLAGS ${PTXCONF_TARGET_EXTRA_CXXFLAGS} } cpp_add_host_extra() { add_arg ${PTXDIST_HOST_CPPFLAGS} + add_arg ${pkg_cppflags} } cc_add_host_extra() { cpp_add_host_extra + add_arg ${pkg_cflags} } cxx_add_host_extra() { cpp_add_host_extra + add_arg ${pkg_cxxflags} } |