Merge pull request #628 from springmeyer/scons-clang-avoid-exit
Allow configure to work with clang and openmp disabled
This commit is contained in:
		
						commit
						cc73ed19b3
					
				| @ -150,8 +150,9 @@ if GetOption('buildconfiguration') != 'debug' and sys.platform != 'darwin' and G | |||||||
| 	env.Append(CCFLAGS = ['-march=native']) | 	env.Append(CCFLAGS = ['-march=native']) | ||||||
| 
 | 
 | ||||||
| if not conf.CheckHeader('omp.h'): | if not conf.CheckHeader('omp.h'): | ||||||
| 	print "Compiler does not support OpenMP. Exiting" | 	if "clang" not in env["CXX"]: | ||||||
| 	Exit(-1) | 		print "OpenMP not found, Exiting" | ||||||
|  | 		Exit(-1) | ||||||
| if not conf.CheckLibWithHeader('bz2', 'bzlib.h', 'CXX'): | if not conf.CheckLibWithHeader('bz2', 'bzlib.h', 'CXX'): | ||||||
| 	print "bz2 library not found. Exiting" | 	print "bz2 library not found. Exiting" | ||||||
| 	Exit(-1) | 	Exit(-1) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user