Bugfix: fixed a bug introduced by the Argv&envp mangling rules generator patch

1 files changed, 7 insertions, 5 deletions

diff --git a/utils/sb2 b/utils/sb2
index 4b3e5fc..1cbff9a 100755
--- a/utils/sb2
+++ b/utils/sb2
@@ -1160,11 +1160,6 @@ export LD_LIBRARY_PATH
 # ------------
 # Now everything is ready, programs can be executed in SB2'ed environment.
 # Make automatically generated rules, if needed:
-if [ -n "CREATE_ARGVMODS_USR_BIN_RULES" ]
-then
-	create_argvmods_usr_bin_rules "$CREATE_ARGVMODS_USR_BIN_RULES"
-fi
-
 if [ -z "$SBOX_JOIN_SESSION_FILE" ]; then
 	#
 	# Only generate argvmods rules when we are not joining
@@ -1172,6 +1167,13 @@ if [ -z "$SBOX_JOIN_SESSION_FILE" ]; then
 	#
 	create_argvmods_rules
 
+	# if needed, create path mapping rules for toolchain components.
+	# this can only be done after "create_argvmods_rules" has been executed.
+	if [ -n "CREATE_ARGVMODS_USR_BIN_RULES" ]
+	then
+		create_argvmods_usr_bin_rules "$CREATE_ARGVMODS_USR_BIN_RULES"
+	fi
+
 	#
 	# Create reverse mapping rules before starting the
 	# actual command (or shell).