summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-06-28 11:07:44 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-06-28 11:07:46 +0200
commit3f2832036001865355f51217cfeb396db56de49f (patch)
tree36feb239b64cb91fec1ee04ed07e937e02851484
parent25bc2521df8a257e1c3480112a96f55a73dc5c99 (diff)
downloadptxdist-3f2832036001865355f51217cfeb396db56de49f.tar.gz
ptxdist-3f2832036001865355f51217cfeb396db56de49f.tar.xz
ptxd_make_world_common: export some variables globally
The variable names in shell and make are the same so they can just be exported in make. None of those variables are in any way target specific, so it's save to have the available everywhere. This keeps the command-line a bit shorter. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/other/Namespace.make1
-rw-r--r--rules/other/Toplevel.make1
-rw-r--r--rules/post/ptxd_make_world_common.make5
3 files changed, 2 insertions, 5 deletions
diff --git a/rules/other/Namespace.make b/rules/other/Namespace.make
index c612aaf30..b17aa0da7 100644
--- a/rules/other/Namespace.make
+++ b/rules/other/Namespace.make
@@ -12,6 +12,7 @@ PTXDIST_SYSROOT_HOST := $(PTXCONF_SYSROOT_HOST)
PTXDIST_SYSROOT_CROSS := $(PTXCONF_SYSROOT_CROSS)
PTXDIST_SYSROOT_TARGET := $(PTXCONF_SYSROOT_TARGET)
SYSROOT := $(PTXCONF_SYSROOT_TARGET)
+export PTXDIST_SYSROOT_HOST PTXDIST_SYSROOT_CROSS PTXDIST_SYSROOT_TARGET
PTXCONF_COMPILER_PREFIX_KERNEL := $(call remove_quotes, $(PTXCONF_COMPILER_PREFIX_KERNEL))
PTXCONF_COMPILER_PREFIX_BOOTLOADER := \
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make
index 32b662398..c90154a13 100644
--- a/rules/other/Toplevel.make
+++ b/rules/other/Toplevel.make
@@ -47,6 +47,7 @@ $(call ptx/file,>>$(PTXDIST_TEMPDIR)/setup-once)
endif
unexport MAKEFLAGS
+export MAKE
PHONY := all FORCE
all:
diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make
index 06fcb4349..172f4c329 100644
--- a/rules/post/ptxd_make_world_common.make
+++ b/rules/post/ptxd_make_world_common.make
@@ -7,11 +7,6 @@
#
ptx/env = \
- MAKE="$(call ptx/escape,$(MAKE))" \
- PTXDIST_SYSROOT_TARGET="$(call ptx/escape,$(PTXDIST_SYSROOT_TARGET))" \
- PTXDIST_SYSROOT_HOST="$(call ptx/escape,$(PTXDIST_SYSROOT_HOST))" \
- PTXDIST_SYSROOT_CROSS="$(call ptx/escape,$(PTXDIST_SYSROOT_CROSS))" \
- \
ptx_nfsroot="$(call ptx/escape,$(ROOTDIR))" \
\
ptx_extract_dir_target="$(call ptx/escape,$(BUILDDIR))" \