Skip to content

Commit

Permalink
use HOST_MULTIARCH for debian
Browse files Browse the repository at this point in the history
  • Loading branch information
btovar committed Sep 22, 2015
1 parent 3de4f81 commit 6f63dfc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ fi

potential_packages="dttools ${include_package_makeflow} work_queue ${include_package_apps} ${include_package_sand} ${include_package_allpairs} ${include_package_wavefront} ${include_package_ftplite} ${include_package_parrot} ${include_package_resource_monitor} ${include_package_chirp} ${include_package_weaver} ${include_package_umbrella} ${include_package_prune} ${include_package_doc}"

check_multiarch
export HOST_MULTIARCH=$(check_multiarch)

if [ -f config.mk ]; then
echo "we are reconfiguring - prepare with make clean..."
Expand Down
17 changes: 5 additions & 12 deletions configure.tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ library_search()
then
return 0
fi
if [ X$HOST_MULTIARCH != X ] && library_search_multiarch $@;
if [ "X${HOST_MULTIARCH}" != X ] && library_search_multiarch $@;
then
return 0
fi
Expand Down Expand Up @@ -222,13 +222,6 @@ library_search_normal()
libdir="$libdir/$3"
fi

# If no third argument, and debian based, libraries are in ARCH-linux-gnu.
arch=`uname -m`
if [ -z "$3" -a -d "$libdir/$arch-linux-gnu" ]
then
libdir="$libdir/$arch-linux-gnu"
fi

# Now check for the library file in all of the known places,
# and add it to the link line as appropriate for the type and platform.

Expand Down Expand Up @@ -589,14 +582,14 @@ check_for_globus()

check_multiarch()
{
echon "checking for multiarch environment..."
if [ -r /etc/debian_version ]; then
HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null`
echo "$HOST_MULTIARCH"
HOST_MULTIARCH="$(uname -m)-linux-gnu"
else
HOST_MULTIARCH=
echo "no"
fi

# echo to capture result
echo "$HOST_MULTIARCH"
}

format_version()
Expand Down

0 comments on commit 6f63dfc

Please sign in to comment.