trunk : default compiler at BUT is now 64bit g++, removing BUT specific lines from build scripts

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3028 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

src/configure

@@ -297,12 +297,7 @@ function linux_configure_cuda {
     echo CUDATKDIR = $CUDATKDIR >> kaldi.mk
 
     if [ "`uname -m`" == "x86_64" ]; then
-      if [ "`hostname -d`" == "fit.vutbr.cz" ]; then
-        #BUT machines by default compile 32bits
-        cat makefiles/linux_cuda.mk >> kaldi.mk 
-      else
-        cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk
-      fi
+      cat makefiles/linux_x86_64_cuda.mk >> kaldi.mk
     else
       cat makefiles/linux_cuda.mk >> kaldi.mk
     fi

src/cudamatrix/Makefile

@@ -44,11 +44,8 @@ endif
 
 
 #implicit rule for kernel compilation
-#symlink in necessary for cross-compilation at BUT
 %.o : %.cu
-	-ln -s `which $(CC)` gcc
-	export PATH=$(CUDATKDIR)/bin:$(PWD):$(PWD)/cudamatrix:$(PATH); $(CUDATKDIR)/bin/nvcc -c $< -o $@ $(CUDA_INCLUDE) $(CUDA_FLAGS) $(CUDA_ARCH) -I../
-	-unlink gcc
+	$(CUDATKDIR)/bin/nvcc -c $< -o $@ $(CUDA_INCLUDE) $(CUDA_FLAGS) $(CUDA_ARCH) -I../
 
 
 ADDLIBS = ../matrix/kaldi-matrix.a ../base/kaldi-base.a  ../util/kaldi-util.a