StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "config: swap to glibc 2.17" am: f4803454b0

Browse Source 
am: 5106157118

Change-Id: If14fbfc6a66f39f36a2d8c626576a2e0582c630a
This commit is contained in:
George Burgess IV
2019-01-29 14:47:13 -08:00
committed by android-build-merger
parent 6ac171c19c 5106157118
commit 1b9ee9d55e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/config/x86_linux_host.go
View File

@@ -111,14 +111,22 @@ var (
)
const (
linuxGccVersion = "4.8"
linuxGccVersion = "4.8.3"
linuxGlibcVersion = "2.17"
)
func init() {
pctx.StaticVariable("LinuxGccVersion", linuxGccVersion)
pctx.StaticVariable("LinuxGlibcVersion", linuxGlibcVersion)
// Most places use the full GCC version. A few only use up to the first two numbers.
if p := strings.Split(linuxGccVersion, "."); len(p) > 2 {
pctx.StaticVariable("ShortLinuxGccVersion", strings.Join(p[:2], "."))
} else {
pctx.StaticVariable("ShortLinuxGccVersion", linuxGccVersion)
}
pctx.SourcePathVariable("LinuxGccRoot",
"prebuilts/gcc/${HostPrebuiltTag}/host/x86_64-linux-glibc2.15-${LinuxGccVersion}")
"prebuilts/gcc/${HostPrebuiltTag}/host/x86_64-linux-glibc${LinuxGlibcVersion}-${ShortLinuxGccVersion}")
pctx.StaticVariable("LinuxGccTriple", "x86_64-linux")