diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-29 00:05:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-29 00:05:04 +0000 |
| commit | 1d564b426399292021bf521360ef40451367a4ce (patch) | |
| tree | 0e1138c654ce47595e9075027df94990d7e7b961 | |
| parent | 6c7da9e1f76d7d62d3387f0863f2b89f068f9be0 (diff) | |
| parent | 729ab5df02fd20bea1f6bb30d30414af32fa6a71 (diff) | |
| download | bison-1d564b426399292021bf521360ef40451367a4ce.tar.gz | |
Merge changes I0def9711,I2e2e7dfd
* changes:
macOS 10.13 is the minimum version now
Get clang version from soong
| -rw-r--r-- | Android.bp | 11 | ||||
| -rwxr-xr-x | android_regen.sh | 2 |
2 files changed, 1 insertions, 12 deletions
@@ -28,17 +28,6 @@ cc_defaults { "darwin-lib", "lib", ], - - // This isn't being distributed to end-users, so bump up our machine - // requirements. - cflags: [ - "-mmacosx-version-min=10.13", - "-UMACOSX_DEPLOYMENT_TARGET", - "-DMACOSX_DEPLOYMENT_TARGET=10.13", - ], - ldflags: [ - "-mmacosx-version-min=10.13", - ], }, glibc: { local_include_dirs: [ diff --git a/android_regen.sh b/android_regen.sh index 824bb75e..6cad17f8 100755 --- a/android_regen.sh +++ b/android_regen.sh @@ -37,7 +37,7 @@ if [ "$1" = "--musl_sysroot" ]; then fi if [ $NAME == "linux_glibc" ]; then - export CC="$ANDROID_BUILD_TOP/prebuilts/clang/host/linux-x86/clang-r370808/bin/clang" + export CC="$ANDROID_BUILD_TOP/prebuilts/clang/host/linux-x86/$(cd $ANDROID_BUILD_TOP; build/soong/scripts/get_clang_version.py)/bin/clang" export CFLAGS="--sysroot=$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/sysroot" export LDFLAGS="--sysroot=$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/sysroot -B$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/lib/gcc/x86_64-linux/4.8.3 -L$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/lib/gcc/x86_64-linux/4.8.3 -L$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/x86_64-linux/lib64" fi |