dev-util/android-tools: fix 9.9.0_p3 CC bug 674162

Reported-by: Toralf Förster <toralf@gentoo.org>
Closes: https://bugs.gentoo.org/674162
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Zac Medico <zmedico@gentoo.org>
This commit is contained in:
Zac Medico
2018-12-31 01:08:27 -08:00
parent 5e208d21b0
commit e0d7fc6a25

View File

@@ -95,6 +95,16 @@ src_prepare() {
cd "${S}" || die
default
sed -E \
-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
-i build.ninja || die
# The pregenerated ninja file expects the build/ dir.
BUILD_DIR="${CMAKE_USE_DIR}/build"
cmake-utils_src_prepare
@@ -104,16 +114,6 @@ src_configure() {
append-lfs-flags
cmake-utils_src_configure
sed -i \
-e "s:@CC@:$(tc-getCC):g" \
-e "s:@CXX@:$(tc-getCXX):g" \
-e "s:@CFLAGS@:${CFLAGS}:g" \
-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
-e "s:@LDFLAGS@:${LDFLAGS}:g" \
-e "s:@PV@:${PV}:g" \
build.ninja || die
}
src_compile() {