diff --git a/toolchain/clang.gni b/toolchain/clang.gni
index 5aab3f3a800121037f69e813a0d3b9f6b5f11421..429eb4ff9c8823e5f2e5eec866dcccb5d12ee43f 100755
--- a/toolchain/clang.gni
+++ b/toolchain/clang.gni
@@ -62,19 +62,18 @@ template("clang_toolchain") {
     }
     tool("solink") {
       outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
-      stripped_outfile = outfile
+      unstripped_outfile = outfile
 
       rspfile = "$outfile.rsp"
       rspfile_content = "{{inputs}}"
       command = ""
       if (need_strip) {
-        stripped_outfile = "{{output_dir}}/usr/lib/stripped/{{target_output_name}}{{output_extension}}"
-        command += "mkdir -p {{output_dir}}/usr/lib/stripped && "
+        unstripped_outfile = "{{output_dir}}/unstripped/usr/lib/{{target_output_name}}{{output_extension}}"
       }
 
-      command += "$ld -shared {{ldflags}} {{inputs}} {{libs}} -o $outfile"
+      command += "$ld -shared {{ldflags}} {{inputs}} {{libs}} -o $unstripped_outfile"
       if (need_strip) {
-        command += " && $strip \"$outfile\" \"$stripped_outfile\""
+        command += " && $strip \"$unstripped_outfile\" \"$outfile\""
       }
 
       default_output_extension = ".so"
@@ -82,33 +81,32 @@ template("clang_toolchain") {
       default_output_dir = "{{root_out_dir}}"
       output_prefix = "lib"
       outputs = [ outfile ]
-      if (stripped_outfile != outfile) {
-        outputs += [ stripped_outfile ]
+      if (unstripped_outfile != outfile) {
+        outputs += [ unstripped_outfile ]
       }
     }
     tool("link") {
       outfile = "{{output_dir}}/bin/{{target_output_name}}{{output_extension}}"
-      stripped_outfile = outfile
+      unstripped_outfile = outfile
 
       rspfile = "$outfile.rsp"
       custom_ld_flags = " "
       command = ""
       if (need_strip) {
-        stripped_outfile = "{{output_dir}}/bin/stripped/{{target_output_name}}{{output_extension}}"
-        command += "mkdir -p {{output_dir}}/bin/stripped && "
+        unstripped_outfile = "{{output_dir}}/unstripped/bin/{{target_output_name}}{{output_extension}}"
       }
       command +=
-          "$cc {{ldflags}} {{inputs}} {{libs}} $custom_ld_flags -o $outfile"
+          "$cc {{ldflags}} {{inputs}} {{libs}} $custom_ld_flags -o $unstripped_outfile"
       if (need_strip) {
-        command += " && $strip \"$outfile\" \"$stripped_outfile\""
+        command += " && $strip \"$unstripped_outfile\" \"$outfile\""
       }
 
       description = "LLVM LINK $outfile"
       default_output_dir = "{{root_out_dir}}"
       rspfile_content = "{{inputs}}"
       outputs = [ outfile ]
-      if (stripped_outfile != outfile) {
-        outputs += [ stripped_outfile ]
+      if (unstripped_outfile != outfile) {
+        outputs += [ unstripped_outfile ]
       }
     }
     tool("stamp") {
diff --git a/toolchain/gcc.gni b/toolchain/gcc.gni
index e03908417292a1e50e35bc29615f3c7cca8abfc0..34847af4bc9c9a0dc28c75678e1fa5c0883a4251 100755
--- a/toolchain/gcc.gni
+++ b/toolchain/gcc.gni
@@ -73,25 +73,24 @@ template("gcc_toolchain") {
     }
     tool("solink") {
       outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
-      stripped_outfile = outfile
+      unstripped_outfile = outfile
 
       rspfile = "$outfile.rsp"
       rspfile_content = "{{inputs}}"
       command = ""
       if (need_strip) {
-        stripped_outfile = "{{output_dir}}/usr/lib/stripped/{{target_output_name}}{{output_extension}}"
-        command += "mkdir -p {{output_dir}}/usr/lib/stripped && "
+        unstripped_outfile = "{{output_dir}}/unstripped/usr/lib/{{target_output_name}}{{output_extension}}"
       }
       command +=
           "$ld -shared {{ldflags}} $extra_ldflags " +
-          "-Wl,--start-group {{inputs}} {{libs}} -Wl,--end-group -o $outfile"
+          "-Wl,--start-group {{inputs}} {{libs}} -Wl,--end-group -o $unstripped_outfile"
       if (need_strip) {
-        command += " && $strip \"$outfile\" -o \"$stripped_outfile\""
+        command += " && $strip \"$unstripped_outfile\" -o \"$outfile\""
       }
       description = "SOLINK $outfile"
       outputs = [ outfile ]
-      if (stripped_outfile != outfile) {
-        outputs += [ stripped_outfile ]
+      if (unstripped_outfile != outfile) {
+        outputs += [ unstripped_outfile ]
       }
       default_output_dir = "{{root_out_dir}}"
       default_output_extension = ".so"
@@ -99,27 +98,26 @@ template("gcc_toolchain") {
     }
     tool("link") {
       outfile = "{{output_dir}}/bin/{{target_output_name}}{{output_extension}}"
-      stripped_outfile = outfile
+      unstripped_outfile = outfile
 
       rspfile = "$outfile.rsp"
       command = ""
       if (need_strip) {
-        stripped_outfile = "{{output_dir}}/bin/stripped/{{target_output_name}}{{output_extension}}"
-        command += "mkdir -p {{output_dir}}/bin/stripped && "
+        unstripped_outfile = "{{output_dir}}/unstripped/bin/{{target_output_name}}{{output_extension}}"
       }
       command +=
           "$ld {{ldflags}} $extra_ldflags " +
-          "-Wl,--start-group {{inputs}} {{libs}} -Wl,--end-group -o $outfile "
+          "-Wl,--start-group {{inputs}} {{libs}} -Wl,--end-group -o $unstripped_outfile "
       if (need_strip) {
-        command += " && $strip \"$outfile\" -o \"$stripped_outfile\""
+        command += " && $strip \"$unstripped_outfile\" -o \"$outfile\""
       }
 
       description = "LINK $outfile"
       default_output_dir = "{{root_out_dir}}"
       rspfile_content = "{{inputs}}"
       outputs = [ outfile ]
-      if (stripped_outfile != outfile) {
-        outputs += [ stripped_outfile ]
+      if (unstripped_outfile != outfile) {
+        outputs += [ unstripped_outfile ]
       }
     }
     tool("stamp") {