diff options
| author | Christopher Di Bella <cjdb@google.com> | 2021-12-07 19:54:18 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-12-07 21:37:41 +0000 |
| commit | 86fe58c1efd0db1d0d95b3cb0d6c34d105b39126 (patch) | |
| tree | 2a26fac4faba08b637c65fc3a01f1431b2f8069b /compiler_wrapper/sysroot_flag.go | |
| parent | d02a62da66a5ca7d7d849aca8289ca783a68a7c8 (diff) | |
| download | toolchain-utils-86fe58c1efd0db1d0d95b3cb0d6c34d105b39126.tar.gz | |
compiler_wrapper: adds ${sysroot}/usr/lib to linker path
This change has been in chromiumos-overlay for a while now, but it
apparently wasn't ever committed to toolchain-utils.
BUG=b:209649372
TEST=This has been in prod for ages.
Change-Id: Ied0b519f2f30ef275e921f41e6dbdee9c9442d03
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3321723
Tested-by: Christopher Di Bella <cjdb@google.com>
Auto-Submit: Christopher Di Bella <cjdb@google.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Diffstat (limited to 'compiler_wrapper/sysroot_flag.go')
| -rw-r--r-- | compiler_wrapper/sysroot_flag.go | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/compiler_wrapper/sysroot_flag.go b/compiler_wrapper/sysroot_flag.go index 501fb20e..e0583b22 100644 --- a/compiler_wrapper/sysroot_flag.go +++ b/compiler_wrapper/sysroot_flag.go @@ -11,9 +11,14 @@ import ( func processSysrootFlag(builder *commandBuilder) { fromUser := false + userSysroot := "" for _, arg := range builder.args { if arg.fromUser && strings.HasPrefix(arg.value, "--sysroot=") { fromUser = true + sysrootArg := strings.Split(arg.value, "=") + if len(sysrootArg) == 2 { + userSysroot = sysrootArg[1] + } break } } @@ -27,5 +32,13 @@ func processSysrootFlag(builder *commandBuilder) { } if !fromUser { builder.addPreUserArgs("--sysroot=" + sysroot) + } else { + sysroot = userSysroot } + + libdir := "-L" + sysroot + "/usr/lib" + if strings.Contains(builder.target.target, "64") { + libdir += "64" + } + builder.addPostUserArgs(libdir) } |