Merge pull request #91 from canonical/make-environment

Set PATH environment variable in make command
canonical · Oct 19, 2022 · c4d1265 · c4d1265
2 parents 318d3d6 + 10c3ff5
commit c4d1265
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/internal/statemachine/classic_states.go b/internal/statemachine/classic_states.go
@@ -339,10 +339,13 @@ func (stateMachine *StateMachine) buildGadgetTree() error {
 
 	// now run "make" to build the gadget tree
 	makeCmd := execCommand("make")
+	// add ARCH and SERIES environment variables for making the gadget tree
 	makeCmd.Env = append(makeCmd.Env, []string{
 		fmt.Sprintf("ARCH=%s", classicStateMachine.ImageDef.Architecture),
 		fmt.Sprintf("SERIES=%s", classicStateMachine.ImageDef.Series),
 	}...)
+	// add the current ENV to the command
+	makeCmd.Env = append(makeCmd.Env, os.Environ()...)
 	makeCmd.Dir = sourceDir
 
 	makeOutput := helper.SetCommandOutput(makeCmd, classicStateMachine.commonFlags.Debug)