Fix nanos6 cross-compilation for riscv
This commit is contained in:
		
							parent
							
								
									28da2f62ef
								
							
						
					
					
						commit
						32ecd3014d
					
				| @ -48,6 +48,8 @@ let | |||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   source = if (useGit) then git else release; |   source = if (useGit) then git else release; | ||||||
|  | 
 | ||||||
|  |   isCross = stdenv.hostPlatform != stdenv.buildPlatform; | ||||||
| in | in | ||||||
|   stdenv.mkDerivation (source // { |   stdenv.mkDerivation (source // { | ||||||
|     pname = "nanos6"; |     pname = "nanos6"; | ||||||
| @ -72,9 +74,11 @@ in | |||||||
|       "--disable-all-instrumentations" |       "--disable-all-instrumentations" | ||||||
|       "--enable-ovni-instrumentation" |       "--enable-ovni-instrumentation" | ||||||
|       "--with-ovni=${ovni}" |       "--with-ovni=${ovni}" | ||||||
|  |       "--with-boost=${boost.dev}" | ||||||
|     ] ++ |     ] ++ | ||||||
|       (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++ |       (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++ | ||||||
|       (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG"); |       (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++ | ||||||
|  |       (optional isCross "--with-symbol-resolution=ifunc"); | ||||||
| 
 | 
 | ||||||
|     postConfigure = lib.optionalString (!enableDebug) '' |     postConfigure = lib.optionalString (!enableDebug) '' | ||||||
|       # Disable debug |       # Disable debug | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user