[packages/android-tools] use CC/CXX
glen
glen at pld-linux.org
Sun Nov 13 14:34:07 CET 2016
commit 0730f71830611e13451bd3b80f98455fbd5dea0d
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Nov 13 15:30:33 2016 +0200
use CC/CXX
android-tools.spec | 5 ++++-
generate_build.rb | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/android-tools.spec b/android-tools.spec
index 07486c8..a24c414 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -70,7 +70,10 @@ cp -p %{SOURCE5} 51-android.rules
%build
%{__ruby} %{SOURCE2} | tee build.sh
-PKGVER=%{git_commit} sh -xe build.sh
+PKGVER=%{git_commit} \
+CC="%{__cc}" \
+CXX="%{__cxx}" \
+sh -xe build.sh
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/generate_build.rb b/generate_build.rb
index e9f81c0..400dec8 100644
--- a/generate_build.rb
+++ b/generate_build.rb
@@ -17,10 +17,10 @@ def compile(sources, cflags)
case ext
when '.c'
- cc = 'gcc'
+ cc = '${CC:-gcc}'
lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
when '.cpp', '.cc'
- cc = 'g++'
+ cc = '${CXX:-g++}'
lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
else
raise "Unknown extension #{ext}"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/android-tools.git/commitdiff/0de251360d215153541345e742ce9451546dca6d
More information about the pld-cvs-commit
mailing list