diff options
| author | George Burgess IV <gbiv@google.com> | 2019-01-29 14:47:13 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-29 14:47:13 -0800 |
| commit | 1b9ee9d55ea9501a14678dee45e1d2a73a65e2b6 (patch) | |
| tree | 65b8220f93afb2d4132cf8a562297c2bd14caef9 /cc | |
| parent | 6ac171c19c792443951319a1b0e8877df7f7adab (diff) | |
| parent | 51061571188acc4edde9ab72d38ece47692e855b (diff) | |
| download | build_soong-1b9ee9d55ea9501a14678dee45e1d2a73a65e2b6.tar.gz build_soong-1b9ee9d55ea9501a14678dee45e1d2a73a65e2b6.tar.bz2 build_soong-1b9ee9d55ea9501a14678dee45e1d2a73a65e2b6.zip | |
Merge "config: swap to glibc 2.17" am: f4803454b0
am: 5106157118
Change-Id: If14fbfc6a66f39f36a2d8c626576a2e0582c630a
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/config/x86_linux_host.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go index 8da21b30..f072f348 100644 --- a/cc/config/x86_linux_host.go +++ b/cc/config/x86_linux_host.go @@ -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") |