diff options
| author | Robin Gareus <robin@gareus.org> | 2016-08-12 13:36:04 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-08-12 13:36:04 +0200 |
| commit | 8e1de17319efb316f6eebdbe1b25dd777a4d3e0e (patch) | |
| tree | c9dceadcb31f1387bc96612f7429a56e854c15ef /tools | |
| parent | c8c6bca6587450ff64303dbc994a4cd28d6ce7aa (diff) | |
allow to manually override gcc ABI selection in the installer
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/install.sh | 8 | ||||
| -rwxr-xr-x | tools/linux_packaging/stage2.run.in | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tools/linux_packaging/install.sh b/tools/linux_packaging/install.sh index b66b6d9dbe..3041c26684 100755 --- a/tools/linux_packaging/install.sh +++ b/tools/linux_packaging/install.sh @@ -15,14 +15,14 @@ cd "${PKG_PATH}" # fd 1 is stdout if [ ! -t 1 ]; then if which xterm > /dev/null; then - exec xterm -e "${PKG_PATH}/.stage2.run" + exec xterm -e "${PKG_PATH}/.stage2.run $@" elif which gnome-terminal > /dev/null; then - exec gnome-terminal -e "${PKG_PATH}/.stage2.run" + exec gnome-terminal -e "${PKG_PATH}/.stage2.run $@" elif which konsole > /dev/null; then - exec konsole -e "${PKG_PATH}/.stage2.run" + exec konsole -e "${PKG_PATH}/.stage2.run $@" fi else - "${PKG_PATH}/.stage2.run" + "${PKG_PATH}/.stage2.run" "$@" fi cd "${SAVED_PWD}" diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in index eb8e3d5cbf..7508fea022 100755 --- a/tools/linux_packaging/stage2.run.in +++ b/tools/linux_packaging/stage2.run.in @@ -240,6 +240,13 @@ if test -n "$MULTABI_BUNDLE"; then else ABI=-gcc5 fi + # allow to manually override + if test "$1" = "--gcc4"; then + ABI=-gcc4 + fi + if test "$1" = "--gcc5"; then + ABI=-gcc5 + fi else ABI= fi |