compiler_wrapper: Update for gcc -> llvm ebuild migration

Update compiler wrapper for migrating the wrappers from
gcc to llvm ebuild.
This assumes that clang wrappers now live in /usr/bin/
instead of /usr/x86-64-pc-linux-gnu/... and is no longer
co-located with gcc wrappers.

BUG=b:186803617
TEST=CQ, SDK tryjobs

Change-Id: I60082913dbf5a3c6ce992ea951955086b280af43
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3046721
Reviewed-by: George Burgess <gbiv@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>

8 files changed, 91 insertions, 81 deletions

diff --git a/compiler_wrapper/clang_flags_test.go b/compiler_wrapper/clang_flags_test.go
index bdc0bbaa..7abbbb16 100644
--- a/compiler_wrapper/clang_flags_test.go
+++ b/compiler_wrapper/clang_flags_test.go
@@ -46,7 +46,7 @@ func TestClangPathGivenClangEnv(t *testing.T) {
 
 func TestAbsoluteClangPathBasedOnRootPath(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.clangRootRelPath = "somepath"
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
 			ctx.newCommand(filepath.Join(ctx.tempDir, clangX86_64), mainCc)))
 		if err := verifyPath(cmd, filepath.Join(ctx.tempDir, "somepath/usr/bin/clang")); err != nil {
@@ -57,7 +57,7 @@ func TestAbsoluteClangPathBasedOnRootPath(t *testing.T) {
 
 func TestRelativeClangPathBasedOnRootPath(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.clangRootRelPath = "somepath"
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
 			ctx.newCommand(clangX86_64, mainCc)))
 		if err := verifyPath(cmd, "somepath/usr/bin/clang"); err != nil {
@@ -68,7 +68,7 @@ func TestRelativeClangPathBasedOnRootPath(t *testing.T) {
 
 func TestRelativeClangPathWithDirBasedOnRootPath(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.clangRootRelPath = "somepath"
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
 			ctx.newCommand("test/x86_64-cros-linux-gnu-clang", mainCc)))
 		if err := verifyPath(cmd, "test/somepath/usr/bin/clang"); err != nil {
@@ -79,7 +79,7 @@ func TestRelativeClangPathWithDirBasedOnRootPath(t *testing.T) {
 
 func TestPathEnvClangPathBasedOnRootPath(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.clangRootRelPath = "somepath"
 		ctx.env = []string{"PATH=" + filepath.Join(ctx.tempDir, "/pathenv")}
 		ctx.writeFile(filepath.Join(ctx.tempDir, "/pathenv/x86_64-cros-linux-gnu-clang"), "")
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
@@ -93,7 +93,7 @@ func TestPathEnvClangPathBasedOnRootPath(t *testing.T) {
 func TestClangPathForClangHostWrapper(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
 		ctx.cfg.isHostWrapper = true
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.clangRootRelPath = "somepath"
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
 			ctx.newCommand(clangX86_64, mainCc)))
 		if err := verifyPath(cmd, filepath.Join(ctx.tempDir, "clang")); err != nil {
@@ -128,7 +128,7 @@ func TestClangPathForAndroidWrapperWithSymlinks(t *testing.T) {
 
 func TestUseXclangPathAndCalcResourceDirByNestedClangCall(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.clangRootRelPath = "somepath"
 		ctx.cmdMock = func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error {
 			if ctx.cmdCount > 1 {
 				return nil
@@ -302,7 +302,7 @@ func TestClangFallbackLinkerPathRelativeToRootDir(t *testing.T) {
 
 func TestClangLinkerPathRelativeToRootDir(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.clangRootRelPath = "somepath"
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
 			ctx.newCommand(clangX86_64, mainCc)))
 		if err := verifyArgOrder(cmd, "-Bsomepath/bin"); err != nil {
diff --git a/compiler_wrapper/command.go b/compiler_wrapper/command.go
index 8b9fa235..95fce7e7 100644
--- a/compiler_wrapper/command.go
+++ b/compiler_wrapper/command.go
@@ -134,7 +134,12 @@ func newCommandBuilder(env env, cfg *config, cmd *command) (*commandBuilder, err
 	if err != nil {
 		return nil, err
 	}
-	rootPath := filepath.Join(filepath.Dir(absWrapperPath), cfg.rootRelPath)
+	var rootPath string
+	if compilerType == gccType {
+		rootPath = filepath.Join(filepath.Dir(absWrapperPath), cfg.gccRootRelPath)
+	} else {
+		rootPath = filepath.Join(filepath.Dir(absWrapperPath), cfg.clangRootRelPath)
+	}
 	return &commandBuilder{
 		path:           cmd.Path,
 		args:           createBuilderArgs( /*fromUser=*/ true, cmd.Args),
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 31caea0b..e5385009 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -26,7 +26,8 @@ type config struct {
 	// by the user).
 	clangPostFlags []string
 	// Toolchain root path relative to the wrapper binary.
-	rootRelPath string
+	clangRootRelPath string
+	gccRootRelPath   string
 	// Directory to store errors that were prevented with -Wno-error.
 	newWarningsDir string
 	// Directory to store nits in when using `WITH_TIDY=tricium`.
@@ -105,7 +106,8 @@ func getConfig(configName string, useCCache bool, useLlvmNext bool, version stri
 // Full hardening.
 // Temporarily disable function splitting because of chromium:434751.
 var crosHardenedConfig = &config{
-	rootRelPath: "../../../../..",
+	clangRootRelPath: "../..",
+	gccRootRelPath:   "../../../../..",
 	// Pass "-fcommon" till the packages are fixed to work with new clang/gcc
 	// default of "-fno-common", crbug.com/1060413.
 	commonFlags: []string{
@@ -161,8 +163,9 @@ var crosHardenedConfig = &config{
 
 // Flags to be added to non-hardened toolchain.
 var crosNonHardenedConfig = &config{
-	rootRelPath: "../../../../..",
-	commonFlags: []string{},
+	clangRootRelPath: "../..",
+	gccRootRelPath:   "../../../../..",
+	commonFlags:      []string{},
 	gccFlags: []string{
 		"-Wno-maybe-uninitialized",
 		"-Wno-unused-local-typedefs",
@@ -202,8 +205,9 @@ var crosNonHardenedConfig = &config{
 
 // Flags to be added to host toolchain.
 var crosHostConfig = &config{
-	isHostWrapper: true,
-	rootRelPath:   "../..",
+	isHostWrapper:    true,
+	clangRootRelPath: "../..",
+	gccRootRelPath:   "../..",
 	// Pass "-fcommon" till the packages are fixed to work with new clang/gcc
 	// default of "-fno-common", crbug.com/1060413.
 	commonFlags: []string{
@@ -250,7 +254,8 @@ var crosHostConfig = &config{
 var androidConfig = &config{
 	isHostWrapper:     false,
 	isAndroidWrapper:  true,
-	rootRelPath:       "./",
+	gccRootRelPath:    "./",
+	clangRootRelPath:  "./",
 	commonFlags:       []string{},
 	gccFlags:          []string{},
 	clangFlags:        []string{},
diff --git a/compiler_wrapper/sysroot_flag_test.go b/compiler_wrapper/sysroot_flag_test.go
index 308d5e96..b05a627e 100644
--- a/compiler_wrapper/sysroot_flag_test.go
+++ b/compiler_wrapper/sysroot_flag_test.go
@@ -57,7 +57,7 @@ func TestClearEmptySysrootFlagInEnv(t *testing.T) {
 
 func TestSetSysrootRelativeToWrapperPath(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.gccRootRelPath = "somepath"
 		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
 			ctx.newCommand(gccX86_64, mainCc)))
 		if err := verifyArgOrder(cmd,
@@ -69,7 +69,7 @@ func TestSetSysrootRelativeToWrapperPath(t *testing.T) {
 
 func TestSetSysrootRelativeToSymlinkedWrapperPath(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.cfg.rootRelPath = "somepath"
+		ctx.cfg.gccRootRelPath = "somepath"
 		linkedWrapperPath := path.Join(ctx.tempDir, "a/linked/path/x86_64-cros-linux-gnu-gcc")
 		ctx.symlink(path.Join(ctx.tempDir, gccX86_64), linkedWrapperPath)
 
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index df8e2b84..1923c509 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -535,8 +535,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -559,14 +559,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -594,8 +594,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -618,14 +618,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -653,8 +653,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "../usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -677,14 +677,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -715,8 +715,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "/usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "/tmp/usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -739,14 +739,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index a86ab468..1b59a942 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -543,8 +543,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -568,14 +568,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -603,8 +603,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -628,14 +628,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -663,8 +663,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "../usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -688,14 +688,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -726,8 +726,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "/usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "/tmp/usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -751,14 +751,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index f32ac0c6..15140212 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -491,9 +491,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "a/b/usr/bin/clang",
+          "path": "a/b/c/d/e/usr/bin/clang",
           "args": [
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -516,14 +516,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
@@ -544,9 +544,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "a/b/usr/bin/clang",
+          "path": "a/b/c/d/e/usr/bin/clang",
           "args": [
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -569,14 +569,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
@@ -597,9 +597,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "../../usr/bin/clang",
+          "path": "../usr/bin/clang",
           "args": [
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -622,14 +622,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
@@ -653,9 +653,9 @@
     "cmds": [
       {
         "cmd": {
-          "path": "/usr/bin/clang",
+          "path": "/tmp/usr/bin/clang",
           "args": [
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fno-addrsig",
             "-fdebug-default-version=5",
@@ -678,14 +678,14 @@
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ]
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index 75ee0ed3..261dfb6b 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -463,8 +463,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -478,14 +478,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -513,8 +513,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "a/b/usr/bin/clang",
-            "--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+            "a/b/c/d/e/usr/bin/clang",
+            "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -528,14 +528,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
+            "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-Ba/b/bin",
+            "-Ba/b/c/d/e/bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -563,8 +563,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "../../usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "../usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -578,14 +578,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],
@@ -616,8 +616,8 @@
         "cmd": {
           "path": "/usr/bin/ccache",
           "args": [
-            "/usr/bin/clang",
-            "--sysroot=/usr/x86_64-cros-linux-gnu",
+            "/tmp/usr/bin/clang",
+            "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
             "-fdebug-default-version=5",
             "-Wno-tautological-constant-compare",
@@ -631,14 +631,14 @@
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
-            "--prefix=../../bin/x86_64-cros-linux-gnu-",
+            "--prefix=../bin/x86_64-cros-linux-gnu-",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
             "-Wno-deprecated-copy",
             "-mno-movbe",
-            "-B../../bin",
+            "-B../bin",
             "-target",
             "x86_64-cros-linux-gnu"
           ],