Modified file to execute conv-config.sh instead of conv-mach.sh. Added and
authorDavid Kunzman <kunzman2@illinois.edu>
Fri, 25 Aug 2006 04:39:32 +0000 (04:39 +0000)
committerDavid Kunzman <kunzman2@illinois.edu>
Fri, 25 Aug 2006 04:39:32 +0000 (04:39 +0000)
modified the contents of Makefile.cell for xlc support (compilers are no
longer hard-coded).

src/arch/net-linux-cell/special.sh

index 58ebd8f46e8f1c300da7d5e51b9ea2f7335ec4b0..79ddc1e79e23c1c22086b8adba7d8d3f1d64cb36 100755 (executable)
@@ -10,19 +10,26 @@ do
 done
 
 #make library
-. ./conv-mach.sh
+export CHARMINC=../include
+. ./conv-config.sh
 if test ! -f $CELL_SDK_DIR/sysroot/usr/include/libspe.h
 then
   echo "Please define CELL_SDK_DIR in charm/src/arch/net-linux-cell/conv-mach.sh!"
   exit 1
 fi
 
+
 cat > Makefile.cell << EOF
 CELL_SDK_DIR=$CELL_SDK_DIR
-SPU_CC = spu-gcc \$(OPTS)
-SPU_CXX = spu-g++ \$(OPTS)
-SPU_AR = spu-ar
-PPU_EMBEDSPU = ppu32-embedspu
+PPU_CC = $CMK_CC \$(OPTS)
+PPU_CXX = $CMK_CXX \$(OPTS)
+SPU_CC = $CMK_SPE_CC \$(OPTS)
+SPU_CXX = $CMK_SPE_CXX \$(OPTS)
+SPU_LD = $CMK_SPE_LD
+SPU_LDXX = $CMK_SPE_LDXX
+SPU_AR = $CMK_SPE_AR
+PPU_EMBEDSPU = $CMK_PPU_EMBEDSPU
+SPERT_LIBS = $CMK_SPERT_LIBS
 EOF
 
 cd cell_lib && make install