diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2015-09-28 21:33:15 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2015-09-28 21:33:33 -0400 |
| commit | 0632d91c0b15668d32d7a32336bf196e7c25e850 (patch) | |
| tree | e9c20ef5637e550642ac6b2de32828286675a1da | |
| parent | app-admin/salt: remove random_org test (diff) | |
| download | gentoo-0632d91c0b15668d32d7a32336bf196e7c25e850.tar.gz gentoo-0632d91c0b15668d32d7a32336bf196e7c25e850.tar.bz2 gentoo-0632d91c0b15668d32d7a32336bf196e7c25e850.zip | |
www-client/chromium: Fix build with clang
Only set host vars when cross-compiling.
This lets a native clang build work by default.
https://bugs.gentoo.org/561726
Package-Manager: portage-2.2.22_p3
| -rw-r--r-- | www-client/chromium/chromium-45.0.2454.101.ebuild | 14 | ||||
| -rw-r--r-- | www-client/chromium/chromium-46.0.2490.42.ebuild | 14 | ||||
| -rw-r--r-- | www-client/chromium/chromium-47.0.2516.0.ebuild | 14 |
3 files changed, 24 insertions, 18 deletions
diff --git a/www-client/chromium/chromium-45.0.2454.101.ebuild b/www-client/chromium/chromium-45.0.2454.101.ebuild index 15fbe60035bc..c450cda3ef16 100644 --- a/www-client/chromium/chromium-45.0.2454.101.ebuild +++ b/www-client/chromium/chromium-45.0.2454.101.ebuild @@ -469,17 +469,19 @@ src_configure() { fi # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB + tc-export AR CC CXX NM # Tools for building programs to be executed on the build system, bug #410883. - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export LD_host=${CXX_host} + if tc-is-cross-compiler; then + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export NM_host=$(tc-getBUILD_NM) + fi # Bug 491582. export TMPDIR="${WORKDIR}/temp" - mkdir -m 755 "${TMPDIR}" || die + mkdir -p -m 755 "${TMPDIR}" || die local build_ffmpeg_args="" if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then diff --git a/www-client/chromium/chromium-46.0.2490.42.ebuild b/www-client/chromium/chromium-46.0.2490.42.ebuild index 672ea96f1552..565c1f78e92d 100644 --- a/www-client/chromium/chromium-46.0.2490.42.ebuild +++ b/www-client/chromium/chromium-46.0.2490.42.ebuild @@ -469,17 +469,19 @@ src_configure() { fi # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB + tc-export AR CC CXX NM # Tools for building programs to be executed on the build system, bug #410883. - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export LD_host=${CXX_host} + if tc-is-cross-compiler; then + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export NM_host=$(tc-getBUILD_NM) + fi # Bug 491582. export TMPDIR="${WORKDIR}/temp" - mkdir -m 755 "${TMPDIR}" || die + mkdir -p -m 755 "${TMPDIR}" || die local build_ffmpeg_args="" if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then diff --git a/www-client/chromium/chromium-47.0.2516.0.ebuild b/www-client/chromium/chromium-47.0.2516.0.ebuild index 50afc7c5af40..e8acf4a10d82 100644 --- a/www-client/chromium/chromium-47.0.2516.0.ebuild +++ b/www-client/chromium/chromium-47.0.2516.0.ebuild @@ -477,17 +477,19 @@ src_configure() { fi # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB + tc-export AR CC CXX NM # Tools for building programs to be executed on the build system, bug #410883. - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export LD_host=${CXX_host} + if tc-is-cross-compiler; then + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export NM_host=$(tc-getBUILD_NM) + fi # Bug 491582. export TMPDIR="${WORKDIR}/temp" - mkdir -m 755 "${TMPDIR}" || die + mkdir -p -m 755 "${TMPDIR}" || die local build_ffmpeg_args="" if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |