aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786>2015-05-11 15:14:24 +0000
committereschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786>2015-05-11 15:14:24 +0000
commitbddad2d4cc59711e798374d9e43866923cf8cc43 (patch)
treeadb72e5597def3c950f6e47e2f6a191cea13ac3e
parente90c4386b90cd0eade36e23d550cc29345b4c4ef (diff)
Remove multiarch library directory detection
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@106 fb53df36-e548-4a1e-8150-ab98cbd5e786
-rwxr-xr-xsrc/detect.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/detect.sh b/src/detect.sh
index 4a8a036..7bef01a 100755
--- a/src/detect.sh
+++ b/src/detect.sh
@@ -158,17 +158,10 @@ fi
# Check for additional libraries
################################################################################
-# Set library directory name for machine architecture
-if machine=$(gcc -dumpmachine 2>/dev/null); then
- machinedir="${HDF5_DIR}/lib/${machine}"
-else
- machinedir=''
-fi
-
# Set options
# Fortran modules may be located in the lib directory
-HDF5_INC_DIRS="${HDF5_DIR}/include ${machinedir} ${HDF5_DIR}/lib"
-HDF5_LIB_DIRS="${machinedir} ${HDF5_DIR}/lib"
+HDF5_INC_DIRS="${HDF5_DIR}/include ${HDF5_DIR}/lib"
+HDF5_LIB_DIRS="${HDF5_DIR}/lib"
HDF5_LIBS="${HDF5_CXX_LIBS} ${HDF5_FORTRAN_LIBS} ${HDF5_C_LIBS}"