diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:02:20 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:02:20 +0000 |
| commit | 697aad9b8f87998f159d6e898676eb95959260c7 (patch) | |
| tree | ac622b504d672fbb8a71f7b35cff965ed5ceffe8 | |
| parent | 461ad690a20b9323d7225e04e94240331e0609fa (diff) | |
| parent | 287db7598d91803ce1277d654aab5eca22b9c4d1 (diff) | |
| download | cpython2-697aad9b8f87998f159d6e898676eb95959260c7.tar.gz | |
Snap for 8564071 from 287db7598d91803ce1277d654aab5eca22b9c4d1 to mainline-adbd-releaseaml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-adbd-release
Change-Id: Ieafd227b8170af6271dfcfc536fee2ec1d77257b
| -rw-r--r-- | Android.bp | 15 | ||||
| -rw-r--r-- | linux_x86_64/pyconfig/pyconfig.h | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index 028957376a..b13d7e417d 100644 --- a/Android.bp +++ b/Android.bp @@ -114,10 +114,17 @@ cc_defaults { linux_glibc_x86: { enabled: false, }, + linux_musl_x86: { + enabled: false, + }, linux_glibc_x86_64: { local_include_dirs: ["linux_x86_64/pyconfig"], cflags: ["-Werror"], }, + linux_musl_x86_64: { + local_include_dirs: ["linux_x86_64/pyconfig"], + cflags: ["-Werror"], + }, windows: { enabled: false, }, @@ -976,13 +983,7 @@ cc_library_static { "Modules/_ctypes/libffi/src/x86/darwin64.S", ], }, - linux_bionic: { - local_include_dirs: ["linux_x86_64/libffi"], - srcs: [ - "Modules/_ctypes/libffi/src/x86/unix64.S", - ], - }, - linux_glibc_x86_64: { + host_linux: { local_include_dirs: ["linux_x86_64/libffi"], srcs: [ "Modules/_ctypes/libffi/src/x86/unix64.S", diff --git a/linux_x86_64/pyconfig/pyconfig.h b/linux_x86_64/pyconfig/pyconfig.h index 210484d07f..e6c363db6d 100644 --- a/linux_x86_64/pyconfig/pyconfig.h +++ b/linux_x86_64/pyconfig/pyconfig.h @@ -858,7 +858,10 @@ #define HAVE_TMPNAM 1 /* Define to 1 if you have the `tmpnam_r' function. */ +#ifdef __GLIBC__ +// musl does not have tmpnam_r #define HAVE_TMPNAM_R 1 +#endif /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use `HAVE_STRUCT_TM_TM_ZONE' instead. */ |