Merge branch 'jb52287' into 'master'

Fix host-gcc use See merge request mer-core/scratchbox2!41
sailfishos · Dec 17, 2020 · d93761c · d93761c
2 parents c0c79d3 + 44824ec
commit d93761c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 140 deletions.
diff --git a/scratchbox2/execs/sb_exec.c b/scratchbox2/execs/sb_exec.c
@@ -1535,15 +1535,15 @@ static int prepare_exec(const char *exec_fn_name,
 					exec_policy_name,
 					&mapped_file, &my_file, binaryname,
 					(const char **)my_argv, &my_new_argv,
-					(const char **)*new_envp, &my_new_envp,
+					(const char **)my_envp, &my_new_envp,
 					"target");
 			} else {
 				postprocess_result = exec_postprocess_native_executable(
 					exec_policy_name,
 					&mapped_file, &my_file, binaryname,
 					&info,
 					(const char **)my_argv, &my_new_argv,
-					(const char **)*new_envp, &my_new_envp);
+					(const char **)my_envp, &my_new_envp);
 			}
 			my_envp = (char**)my_new_envp; /* FIXME */
 			my_argv = (char**)my_new_argv; /* FIXME */
@@ -1570,7 +1570,7 @@ static int prepare_exec(const char *exec_fn_name,
 					exec_policy_name,
 					&mapped_file, &my_file, binaryname,
 					(const char **)my_argv, &my_new_argv,
-					(const char **)*new_envp, &my_new_envp,
+					(const char **)my_envp, &my_new_envp,
 					"native");
 				my_envp = (char**)my_new_envp; /* FIXME */
 				my_argv = (char**)my_new_argv; /* FIXME */
@@ -1609,7 +1609,7 @@ static int prepare_exec(const char *exec_fn_name,
 					exec_policy_name,
 					&mapped_file, &my_file, binaryname,
 					(const char **)my_argv, &my_new_argv,
-					(const char **)*new_envp, &my_new_envp);
+					(const char **)my_envp, &my_new_envp);
 				my_envp = (char**)my_new_envp; /* FIXME */
 				my_argv = (char**)my_new_argv; /* FIXME */
 			}
@@ -1639,7 +1639,7 @@ static int prepare_exec(const char *exec_fn_name,
 			postprocess_result = exec_postprocess_cpu_transparency_executable(
 				exec_policy_name,
 				&mapped_file, &my_file, binaryname,
-				(const char **)my_argv, &my_new_argv, (const char **)*new_envp, &my_new_envp,
+				(const char **)my_argv, &my_new_argv, (const char **)my_envp, &my_new_envp,
 				"target");
 			my_envp = (char**)my_new_envp; /* FIXME */
 			my_argv = (char**)my_new_argv; /* FIXME */

diff --git a/scratchbox2/lua_scripts/argvenvp_gcc.lua b/scratchbox2/lua_scripts/argvenvp_gcc.lua
@@ -73,10 +73,7 @@ function register_gcc_component_path(tmp, gccrule)
 		table.insert(gcc_tools_path_prefixes, x)
 	end
 
-	if gccrule == nil then
-		return
-	end
-
+	if gccrule ~= nil then
 		if gccrule.cross_gcc_dir ~= nil then
 			table.insert(gcc_tools_path_prefixes, gccrule.cross_gcc_dir)
 		end
@@ -86,6 +83,7 @@ function register_gcc_component_path(tmp, gccrule)
 				table.insert(gcc_tools_path_prefixes, path)
 			end
 		end
+	end
 
 	tmp.path_prefixes = gcc_tools_path_prefixes
 	argvmods[tmp.name] = tmp

diff --git a/scratchbox2/lua_scripts/create_argvmods_usr_bin_rules.lua b/scratchbox2/lua_scripts/create_argvmods_usr_bin_rules.lua