Use source built px cli for EXECUTABLES check

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
(cherry picked from commit b3286a4)

Author: ddelnano

src/pxl_scripts/BUILD.bazel

@@ -46,7 +46,7 @@ genrule(
         ":preset_queries",
     ],
     outs = ["bundle-oss.json"],
-    cmd = "export PATH_PREFIX=$$(dirname $(location //src/pxl_scripts:makefile))/; PX_BIN=../../$(location //src/pixie_cli:px) make -C $$PATH_PREFIX bundle-oss.json; cp bundle-oss.json $(@D)/bundle-oss.json",
+    cmd = "export PATH_PREFIX=$$(dirname $(location //src/pxl_scripts:makefile))/; EXECUTABLES=../../$(location //src/pixie_cli:px) make -C $$PATH_PREFIX bundle-oss.json; cp bundle-oss.json $(@D)/bundle-oss.json",
     tools = [
         "//src/pixie_cli:px",
     ],

src/pxl_scripts/Makefile

@@ -18,14 +18,13 @@
 dirs := bpftrace px pxbeta sotw
 script_files := $(foreach dir,$(dirs),$(wildcard $(dir)/**/*))
 
-EXECUTABLES = px
+EXECUTABLES ?= px
 K := $(foreach exec,$(EXECUTABLES),\
 	$(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
 
 # Optional path prefix to use for the script_files path. Used by bazel
 # to ensure the scripts are in the correct location.
 PATH_PREFIX ?= ""
-PX_BIN ?= px
 
 all: bundle-oss.json.gz
 
@@ -38,7 +37,7 @@ bundle-oss.json: $(script_files)
 		export HOME=$$TMPDIR; \
 		trap "rm -rf $$TMPDIR" EXIT; \
 	fi; \
-	$(PX_BIN) create-bundle --search_path $(PWD) $(foreach dir,$(dirs),--base $(PATH_PREFIX)$(dir)) -o $(PWD)/bundle-oss.json
+	$(EXECUTABLES) create-bundle --search_path $(PWD) $(foreach dir,$(dirs),--base $(PATH_PREFIX)$(dir)) -o $(PWD)/bundle-oss.json
 
 bundle-oss.json.gz: bundle-oss.json
 	gzip -c $< > $@