diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-09 20:37:01 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-09 20:37:01 +0000 |
| commit | 4fdb4460ca20234d8c6ceec9dee87db92a82836f (patch) | |
| tree | b0522edde1d3c5356c95eb1ee2eae3e87befa1f3 /compiler_wrapper/sysroot_flag.go | |
| parent | 4ac7ca7c4f6d13380afa6b0d52313f0f18765038 (diff) | |
| parent | 882a18888febb9cb0b9d6c6069498cbc4aa30f88 (diff) | |
| download | toolchain-utils-android13-mainline-media-release.tar.gz | |
Snap for 8562061 from 882a18888febb9cb0b9d6c6069498cbc4aa30f88 to mainline-media-releaseaml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020android13-mainline-media-release
Change-Id: I95d315734fe4eb0f33eacf393a464b05bb1d3eac
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) } |