summaryrefslogtreecommitdiff
path: root/odk/config/setsdkenv_unix.sh.in
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-09-16 15:03:27 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-09-16 15:05:43 +0200
commit9bd221abfb198fcdf51873e91201a2e717331ae0 (patch)
tree1db1fd7a3c1145eaa816f191572aadfc0beb9b26 /odk/config/setsdkenv_unix.sh.in
parentbd968717c9ca5a6fe8347f93014ac0553ec6d19a (diff)
config.guess is apparently not supposed to be called directly
(if you look at how it is used by generated configure scripts); this fixes the inadvertent loss of executable flag in 3379a4d028a77de5a50e305175d80f65560d5688 "Update config.{guess,sub}" Change-Id: I29b3467970093006c994af63cb5f5bf087831ae6
Diffstat (limited to 'odk/config/setsdkenv_unix.sh.in')
-rw-r--r--odk/config/setsdkenv_unix.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index b721e278f320..4ab9d6289eab 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -89,7 +89,7 @@ then
fi
# Get the operating system.
-sdk_platform=`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
+sdk_platform=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
# Set the directory name.
programdir=program
@@ -143,7 +143,7 @@ fi
# Set the directory name.
case ${sdk_platform} in
solaris*)
- sdk_proctype=`${OO_SDK_HOME}/config.guess | cut -d"-" -f1`
+ sdk_proctype=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f1`
if [ "${sdk_proctype}" = "sparc" ]
then
directoryname=solsparc