Commit d2e87254ea15361ba7a5e3995123ca832185164c
2012-10-22T22:52:27
The ATI stream / AMD APP SDK environment variables appear to only interfere with win32 builds so bypass them.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/configure.ac b/configure.ac
index 9718645..b851af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,20 +98,23 @@ case $target in
;;
esac
-if test "x$have_x86_64" = xtrue; then
- ARCH_DIR=x86_64
-else
- ARCH_DIR=x86
-fi
-if test "x$ATISTREAMSDKROOT" != x; then
- OPENCL_FLAGS="-I$ATISTREAMSDKROOT/include $OPENCL_FLAGS"
- OPENCL_LIBS="-L$ATISTREAMSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
-fi
+if test "x$have_win32" != xtrue; then
+ if test "x$have_x86_64" = xtrue; then
+ ARCH_DIR=x86_64
+ else
+ ARCH_DIR=x86
+ fi
+
+ if test "x$ATISTREAMSDKROOT" != x; then
+ OPENCL_FLAGS="-I$ATISTREAMSDKROOT/include $OPENCL_FLAGS"
+ OPENCL_LIBS="-L$ATISTREAMSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
+ fi
-if test "x$AMDAPPSDKROOT" != x; then
- OPENCL_FLAGS="-I$AMDAPPSDKROOT/include $OPENCL_FLAGS"
- OPENCL_LIBS="-L$AMDAPPSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
+ if test "x$AMDAPPSDKROOT" != x; then
+ OPENCL_FLAGS="-I$AMDAPPSDKROOT/include $OPENCL_FLAGS"
+ OPENCL_LIBS="-L$AMDAPPSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
+ fi
fi
cpumining="no"