Merge branch 'v0.12-beta-test' of github.com:portalinux-project/porta…

…linux into v0.12-beta-test
portalinux-project · Aug 20, 2024 · 281c9b3 · 281c9b3
2 parents 88b988f + 47aeb01
commit 281c9b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/build.rb b/build.rb
@@ -195,8 +195,8 @@ def init
 		when "gcc"
 			parsedConfig.store("cross_cc", "#{parsedConfig["triple"]}-gcc")
 		when "llvm"
-			parsedConfig.store("cross_cc", File.join(parsedConfig["tcprefix"], "/bin/clang"))
-			parsedConfig.store("cross_cflags", "--sysroot=#{parsedConfig["sysroot"]}")
+			parsedConfig.store("cross_cc", "clang")
+			parsedConfig.store("cross_cflags", "--sysroot=#{parsedConfig["sysroot"]} --target=#{parsedConfig["triple"]}")
 		else
 			errorHandler("Unknown toolchain.", false)
 	end

diff --git a/lib/common.rb b/lib/common.rb
@@ -128,6 +128,7 @@ def muslBuild(action, globalVars, isRootfs=false)
 						muslArgs.store("LIBCC", "#{globalVars["sysroot"]}/lib/linux/libclang_rt.builtins-#{globalVars["linux_arch"]}.a")
 						muslArgs.store("AR", "#{globalVars["tcprefix"]}/bin/llvm-ar")
 						muslArgs.store("RANLIB", "#{globalVars["tcprefix"]}/bin/llvm-ranlib")
+						muslArgs.store("CFLAGS", "#{globalVars["cross_cflags"]}")
 				end
 				muslArgs.store("CC", "#{globalVars["tcprefix"]}/bin/#{globalVars["cross_cc"]}")
 

diff --git a/lib/llvm.rb b/lib/llvm.rb
@@ -121,5 +121,11 @@ def toolchainBuild globalVars
 		puts "Done."
 	end
 
+	if File.exist?("#{globalVars["sysroot"]}/lib/libc.so") == false
+		print "Building Musl..."
+		muslBuild("libc", globalVars, false)
+		puts "Done."
+	end
+
 	errorHandler("Remaining LLVM support unimplemented.", false)
 end