diff options
| author | James Zern <jzern@google.com> | 2019-09-28 13:12:49 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2019-09-30 11:13:29 -0700 |
| commit | fad865c54ad99ada3e53ea4a290688f0c56aa15d (patch) | |
| tree | 2878dfe8b6fe4a65f4a1e84419fefb147ad7540a /build/make/configure.sh | |
| parent | 4f69df9969745c3bec295edbb5514a2cc04c7e26 (diff) | |
| download | libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar.gz libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar.bz2 libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.zip | |
namespace ARCH_* defines
this prevents redefinition warnings if a toolchain sets one
BUG=b/117240165
Change-Id: Ib5d8c303cd05b4dbcc8d42c71ecfcba8f6d7b90c
Diffstat (limited to 'build/make/configure.sh')
| -rw-r--r-- | build/make/configure.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 472e7dea7..a4f14c04e 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -518,10 +518,10 @@ fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\${@:.d=.o} \$@;' EOF fi - print_config_mk ARCH "${1}" ${ARCH_LIST} - print_config_mk HAVE "${1}" ${HAVE_LIST} - print_config_mk CONFIG "${1}" ${CONFIG_LIST} - print_config_mk HAVE "${1}" gnu_strip + print_config_mk VPX_ARCH "${1}" ${ARCH_LIST} + print_config_mk HAVE "${1}" ${HAVE_LIST} + print_config_mk CONFIG "${1}" ${CONFIG_LIST} + print_config_mk HAVE "${1}" gnu_strip enabled msvs && echo "CONFIG_VS_VERSION=${vs_version}" >> "${1}" @@ -538,10 +538,10 @@ write_common_target_config_h() { #define RESTRICT ${RESTRICT} #define INLINE ${INLINE} EOF - print_config_h ARCH "${TMP_H}" ${ARCH_LIST} - print_config_h HAVE "${TMP_H}" ${HAVE_LIST} - print_config_h CONFIG "${TMP_H}" ${CONFIG_LIST} - print_config_vars_h "${TMP_H}" ${VAR_LIST} + print_config_h VPX_ARCH "${TMP_H}" ${ARCH_LIST} + print_config_h HAVE "${TMP_H}" ${HAVE_LIST} + print_config_h CONFIG "${TMP_H}" ${CONFIG_LIST} + print_config_vars_h "${TMP_H}" ${VAR_LIST} echo "#endif /* VPX_CONFIG_H */" >> ${TMP_H} mkdir -p `dirname "$1"` cmp "$1" ${TMP_H} >/dev/null 2>&1 || mv ${TMP_H} "$1" |