diff options
Diffstat (limited to 'eclass/mozcoreconf-v6.eclass')
| -rw-r--r-- | eclass/mozcoreconf-v6.eclass | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass index 8cea230a959c..2d94be6baee4 100644 --- a/eclass/mozcoreconf-v6.eclass +++ b/eclass/mozcoreconf-v6.eclass @@ -78,10 +78,10 @@ mozconfig_use_with() { moz_pkgsetup() { # Ensure we use C locale when building - export LANG="C" - export LC_ALL="C" - export LC_MESSAGES="C" - export LC_CTYPE="C" + export LANG="C.UTF-8" + export LC_ALL="C.UTF-8" + export LC_MESSAGES="C.UTF-8" + export LC_CTYPE="C.UTF-8" # Ensure we use correct toolchain export HOST_CC="$(tc-getBUILD_CC)" @@ -195,8 +195,13 @@ mozconfig_init() { # Strip optimization so it does not end up in compile string filter-flags '-O*' + # elf-hack is broken on x86 and disabled by default. if is-flagq '-g*' ; then - mozconfig_annotate 'elf-hack broken with -g* flags' --disable-elf-hack + case "${ARCH}" in + amd64 | arm) + mozconfig_annotate 'elf-hack is broken with -g* flags' --disable-elf-hack + ;; + esac fi # Strip over-aggressive CFLAGS |