steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

factor.sh: Prefer clang to gcc and stop special-casing mac. 

Add deps-dnf command to install all Fedora packages.
Add full-report command to see what's installed.
db4
Doug Coleman 2015-08-23 22:39:00 -07:00
parent 3154e70b88
commit 92e576e544
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build-support/factor.sh
View File

@ -87,23 +87,15 @@ set_md5sum() {
fi fi
} }
set_gcc() { set_cc() {
case $OS in test_program_installed clang gcc
macosx) if [[ $? -ne 0 ]] ; then
xcode_major=`xcodebuild -version | sed -E -ne 's/^Xcode ([0-9]+).*$/\1/p'`
if [[ $xcode_major -ge 4 ]]; then
[ -z "$CC" ] && CC=clang [ -z "$CC" ] && CC=clang
[ -z "$CXX" ] && CXX=clang++ [ -z "$CXX" ] && CXX=clang++
else else
[ -z "$CC" ] && CC=gcc [ -z "$CC" ] && CC=gcc
[ -z "$CXX" ] && CXX=g++ [ -z "$CXX" ] && CXX=g++
fi fi
;;
*)
[ -z "$CC" ] && CC=gcc
[ -z "$CXX" ] && CXX=g++
;;
esac
} }
set_make() { set_make() {
@ -355,7 +347,7 @@ parse_build_info() {
find_build_info() { find_build_info() {
find_os find_os
find_architecture find_architecture
set_gcc set_cc
find_word_size find_word_size
set_factor_binary set_factor_binary
set_factor_library set_factor_library
@ -573,6 +565,12 @@ install_deps_pacman() {
check_ret sudo check_ret sudo
} }
install_deps_dnf() {
sudo dnf --assumeyes install gcc gcc-c++ glibc-devel binutils libX11-devel pango-devel gtk3-devel gdk-pixbuf2-devel gtkglext-devel tmux rlwrap wget
check_ret sudo
}
install_deps_macosx() { install_deps_macosx() {
test_program_installed git test_program_installed git
if [[ $? -ne 1 ]] ; then if [[ $? -ne 1 ]] ; then
@ -622,6 +620,7 @@ case "$1" in
deps-apt-get) install_deps_apt_get ;; deps-apt-get) install_deps_apt_get ;;
deps-pacman) install_deps_pacman ;; deps-pacman) install_deps_pacman ;;
deps-macosx) install_deps_macosx ;; deps-macosx) install_deps_macosx ;;
deps-dnf) install_deps_dnf ;;
self-update) update; make_boot_image; bootstrap;; self-update) update; make_boot_image; bootstrap;;
quick-update) update; refresh_image ;; quick-update) update; refresh_image ;;
update) update; download_and_bootstrap ;; update) update; download_and_bootstrap ;;
@ -629,5 +628,6 @@ case "$1" in
net-bootstrap) net_bootstrap_no_pull ;; net-bootstrap) net_bootstrap_no_pull ;;
make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;; make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;;
report) find_build_info ;; report) find_build_info ;;
full-report) find_build_info; check_installed_programs; check_libraries ;;
*) usage ;; *) usage ;;
esac esac