summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-08-13 00:31:56 +0200
committerRobin Gareus <robin@gareus.org>2016-08-13 00:31:56 +0200
commitfc272ef9d7cc224d9558809b8d473882df48d2df (patch)
tree8ddbf75e7e91427595dc234eb26c139c52979752 /tools
parentfd6dd8b19e29a6020424cecefb4d89ae9322724b (diff)
Another step towards gcc-ABI detection when installing as root
makeself extracts the file with owner-only access. When the installer itself runs as root, NORM_USER won't be able to call the abi-test tool.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/linux_packaging/stage2.run.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index e1fe3ffc1d..ae4e217a49 100755
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -235,7 +235,7 @@ esac
###################
if test -n "$MULTABI_BUNDLE"; then
- if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --fail --gcc5 > /dev/null"; then
+ if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --fail --gcc5; then
ABI=-gcc4
else
ABI=-gcc5
@@ -306,7 +306,7 @@ fi
if test -z "$ABI"; then
if %REPLACE_GCC5%; then
# Ardour was compiled with gcc5, warn on gcc4 systems
- if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
+ if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --gcc5; then
echo ""
echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
echo ""
@@ -321,7 +321,7 @@ if test -z "$ABI"; then
fi
else
# Ardour was compiled with gcc4, warn on gcc5 systems
- if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
+ if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --gcc4 ; then
echo ""
echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
echo ""