aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-07-20 18:45:36 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-01-21 23:35:38 +0200
commit396e355c940d1427ccd7be7435499074f56bab7e (patch)
treebbc66413d2fd7d6e750492401245c4210530cff6
parent54b6afa675a248ca46897acf47f9bf8cf06f047d (diff)
downloadmeson-396e355c940d1427ccd7be7435499074f56bab7e.zip
meson-396e355c940d1427ccd7be7435499074f56bab7e.tar.gz
meson-396e355c940d1427ccd7be7435499074f56bab7e.tar.bz2
Clean up minor issues.
-rw-r--r--mesonbuild/compilers/cuda.py10
-rw-r--r--test cases/cuda/1 simple/prog.cu10
2 files changed, 10 insertions, 10 deletions
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index f398bad..a8cd7bc 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -20,7 +20,6 @@ from .compilers import Compiler, cuda_buildtype_args
class CudaCompiler(Compiler):
def __init__(self, exelist, version, is_cross, exe_wrapper=None):
- # If a child ObjCPP class has already set it, don't set it ourselves
if not hasattr(self, 'language'):
self.language = 'cuda'
super().__init__(exelist, version)
@@ -39,7 +38,7 @@ class CudaCompiler(Compiler):
return 'Cuda'
def get_no_stdinc_args(self):
- return ['']
+ return []
def sanity_check(self, work_dir, environment):
source_name = os.path.join(work_dir, 'sanitycheckcuda.cu')
@@ -49,7 +48,10 @@ class CudaCompiler(Compiler):
extra_flags += self.get_compile_only_args()
code = '''
- #include <stdio.h>
+__global__ void kernel (void) {
+
+}
+
int main(int argc,char** argv){
return 0;
}
@@ -67,7 +69,7 @@ class CudaCompiler(Compiler):
pe = subprocess.Popen(binary_name)
pe.wait()
if pe.returncode != 0:
- raise EnvironmentException('Executables created by ObjC compiler %s are not runnable.' % self.name_string())
+ raise EnvironmentException('Executables created by Cuda compiler %s are not runnable.' % self.name_string())
def get_compiler_check_args(self):
return super().get_compiler_check_args() + []
diff --git a/test cases/cuda/1 simple/prog.cu b/test cases/cuda/1 simple/prog.cu
index ed21152..5f8f0c3 100644
--- a/test cases/cuda/1 simple/prog.cu
+++ b/test cases/cuda/1 simple/prog.cu
@@ -1,13 +1,11 @@
#include <stdio.h>
-#include <iostream>
__global__ void kernel (void){
-
}
-int main( void ) {
- kernel<<<1,1>>>();
- printf( "Hello, World!\n" );
- return 0;
+int main(int argc, char **argv) {
+ kernel<<<1,1>>>();
+ printf("Hello, World!\n");
+ return 0;
}