fix the ZLIB path problem on BGQ
authorYanhua Sun <sun51@illinois.edu>
Thu, 18 Apr 2013 20:07:40 +0000 (20:07 +0000)
committerYanhua Sun <sun51@illinois.edu>
Thu, 18 Apr 2013 20:07:40 +0000 (20:07 +0000)
src/arch/pami-bluegeneq/cc-xlc.sh
src/arch/pami-bluegeneq/conv-mach.sh
src/arch/pamilrts-bluegeneq/cc-xlc.sh
src/arch/pamilrts-bluegeneq/conv-mach.sh

index df293722ec7aa2ea5675a9a3063d5e579f628c0c..5fb79587901bca6afff8b0ac55a64fafd3a4821e 100644 (file)
@@ -1,3 +1,8 @@
+BGQ_ZLIB=/soft/libraries/alcf/current/xl/ZLIB/
+BGQ_BIN=$BGQ_FLOOR/gnu-linux/bin
+BGQ_INC="-I$BGQ_INSTALL/comm/sys/include -I$BGQ_INSTALL/spi/include -I$BGQ_INSTALL -I$BGQ_INSTALL/spi/include/kernel/cnk -I$BGQ_ZLIB/include"
+BGQ_LIB="-L$BGQ_INSTALL/comm/sys-fast/lib -lpami -L$BGQ_INSTALL/spi/lib -L$BGQ_ZLIB/lib -lSPI -lSPI_cnk -lpthread -lrt" 
+CMK_SYSLIBS="$BGQ_LIB"
 CMK_CC="bgxlc_r -qcpluscmt -qhalt=e $BGQ_INC -qnokeyword=__int128"
 CMK_CXX="bgxlC_r -qhalt=e $BGQ_INC -qnokeyword=__int128"
 CMK_LD="$CMK_CC"
@@ -18,3 +23,4 @@ CMK_NATIVE_LDXX="$CMK_NATIVE_CXX"
 CMK_RANLIB="ranlib"
 CMK_F90LIBS="-lxlf90 -lxlopt -lxl -lxlfmath"
 
+
index 2c50c557d679fcd3280c16de52c6c2cbf2db0ae2..cb22c478c4e58421c031eddf9bc8a9898b2dafb9 100644 (file)
@@ -12,12 +12,12 @@ then
   BGQ_INSTALL=$BGQ_TYPICAL_FLOOR
 fi
 
-#BGQ_ZLIB=/soft/libraries/3rdparty/zlib-1.2.6
+BGQ_ZLIB=/soft/libraries/alcf/current/gcc/ZLIB/
 
 BGQ_BIN=$BGQ_FLOOR/gnu-linux/bin
-BGQ_INC="-I$BGQ_INSTALL/comm/sys/include -I$BGQ_INSTALL/spi/include -I$BGQ_INSTALL -I$BGQ_INSTALL/spi/include/kernel/cnk"
+BGQ_INC="-I$BGQ_INSTALL/comm/sys/include -I$BGQ_INSTALL/spi/include -I$BGQ_INSTALL -I$BGQ_INSTALL/spi/include/kernel/cnk -I$BGQ_ZLIB/include"
 
-BGQ_LIB="-L$BGQ_INSTALL/comm/sys-fast/lib -lpami -L$BGQ_INSTALL/spi/lib -lSPI -lSPI_cnk -lpthread -lrt"
+BGQ_LIB="-L$BGQ_INSTALL/comm/sys-fast/lib -lpami -L$BGQ_INSTALL/spi/lib -L$BGQ_ZLIB/lib -lSPI -lSPI_cnk -lpthread -lrt" 
 
 # test if compiler binary present
 if test ! -x $BGQ_BIN/powerpc64-bgq-linux-g++
index df293722ec7aa2ea5675a9a3063d5e579f628c0c..5fb79587901bca6afff8b0ac55a64fafd3a4821e 100644 (file)
@@ -1,3 +1,8 @@
+BGQ_ZLIB=/soft/libraries/alcf/current/xl/ZLIB/
+BGQ_BIN=$BGQ_FLOOR/gnu-linux/bin
+BGQ_INC="-I$BGQ_INSTALL/comm/sys/include -I$BGQ_INSTALL/spi/include -I$BGQ_INSTALL -I$BGQ_INSTALL/spi/include/kernel/cnk -I$BGQ_ZLIB/include"
+BGQ_LIB="-L$BGQ_INSTALL/comm/sys-fast/lib -lpami -L$BGQ_INSTALL/spi/lib -L$BGQ_ZLIB/lib -lSPI -lSPI_cnk -lpthread -lrt" 
+CMK_SYSLIBS="$BGQ_LIB"
 CMK_CC="bgxlc_r -qcpluscmt -qhalt=e $BGQ_INC -qnokeyword=__int128"
 CMK_CXX="bgxlC_r -qhalt=e $BGQ_INC -qnokeyword=__int128"
 CMK_LD="$CMK_CC"
@@ -18,3 +23,4 @@ CMK_NATIVE_LDXX="$CMK_NATIVE_CXX"
 CMK_RANLIB="ranlib"
 CMK_F90LIBS="-lxlf90 -lxlopt -lxl -lxlfmath"
 
+
index 4be91980b1a96db4bb243da7eaba393a7284f594..cb22c478c4e58421c031eddf9bc8a9898b2dafb9 100644 (file)
@@ -12,7 +12,7 @@ then
   BGQ_INSTALL=$BGQ_TYPICAL_FLOOR
 fi
 
-BGQ_ZLIB=/soft/libraries/3rdparty/zlib-1.2.6
+BGQ_ZLIB=/soft/libraries/alcf/current/gcc/ZLIB/
 
 BGQ_BIN=$BGQ_FLOOR/gnu-linux/bin
 BGQ_INC="-I$BGQ_INSTALL/comm/sys/include -I$BGQ_INSTALL/spi/include -I$BGQ_INSTALL -I$BGQ_INSTALL/spi/include/kernel/cnk -I$BGQ_ZLIB/include"