allow to manually override gcc ABI selection in the installer

diff --git a/tools/linux_packaging/install.sh b/tools/linux_packaging/install.sh
index b66b6d9dbef26709d5f1ae6156c1d191e7ea9fec..3041c266843dc72d3361facf20b1f04a6c6c659d 100755 (executable)
--- 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 eb8e3d5cbf9668a21512e6cd05a1fe2a70ec9c73..7508fea022e23f435c1cc4681fd66cf0d22884c9 100755 (executable)
--- 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