diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | package/Makefile.in | 4 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -573,7 +573,7 @@ endif @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_BUILD_SCRIPT)), \ $(call MESSAGE,"Executing post-build script $(s)"); \ - $(USER_HOOKS_EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge @@ -619,7 +619,7 @@ endif target-post-image: $(TARGETS_ROOTFS) target-finalize @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ - $(USER_HOOKS_EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) + $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) toolchain-eclipse-register: ./support/scripts/eclipse-register-toolchain `readlink -f $(O)` $(notdir $(TARGET_CROSS)) $(BR2_ARCH) diff --git a/package/Makefile.in b/package/Makefile.in index 31eaaf225c..c34a3bf43d 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -297,11 +297,11 @@ HOST_MAKE_ENV=PATH=$(BR_PATH) \ PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" -# This extra environment we can not export ourselves (eg. because some +# This is extra environment we can not export ourselves (eg. because some # packages use that variable internally, eg. uboot), so we have to # explicitly pass it to user-supplied external hooks (eg. post-build, # post-images) -USER_HOOKS_EXTRA_ENV=\ +EXTRA_ENV=\ PATH=$(BR_PATH) \ BUILD_DIR=$(BUILD_DIR) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index c162902f23..8a62d4c120 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -58,7 +58,7 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time # User-supplied script define step_user @$(foreach user_hook, $(BR2_INSTRUMENTATION_SCRIPTS), \ - $(USER_HOOKS_EXTRA_ENV) $(user_hook) "$(1)" "$(2)" "$(3)"$(sep)) + $(EXTRA_ENV) $(user_hook) "$(1)" "$(2)" "$(3)"$(sep)) endef ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),) GLOBAL_INSTRUMENTATION_HOOKS += step_user |
