This commit is contained in:
Branimir Karadžić
2018-09-22 22:22:46 -07:00
parent 4b1bc5bd32
commit 44f846c703

View File

@@ -395,9 +395,9 @@ function toolchain(_buildDir, _libDir)
location (path.join(_buildDir, "projects", _ACTION .. "-rpi"))
elseif "riscv" == _OPTIONS["gcc"] then
premake.gcc.cc = "$(FREEDOM_E_SDK)/toolchain/bin/riscv32-unknown-elf-gcc"
premake.gcc.cxx = "$(FREEDOM_E_SDK)/toolchain/bin/riscv32-unknown-elf-g++"
premake.gcc.ar = "$(FREEDOM_E_SDK)/toolchain/bin/riscv32-unknown-elf-ar"
premake.gcc.cc = "$(FREEDOM_E_SDK)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/bin/riscv64-unknown-elf-gcc"
premake.gcc.cxx = "$(FREEDOM_E_SDK)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/bin/riscv64-unknown-elf-g++"
premake.gcc.ar = "$(FREEDOM_E_SDK)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/bin/riscv64-unknown-elf-ar"
location (path.join(_buildDir, "projects", _ACTION .. "-riscv"))
end
@@ -1257,13 +1257,13 @@ function toolchain(_buildDir, _libDir)
"__MISC_VISIBLE",
}
includedirs {
"$(FREEDOM_E_SDK)/toolchain/riscv32-unknown-elf/include",
"$(FREEDOM_E_SDK)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/riscv64-unknown-elf/include",
path.join(bxDir, "include/compat/riscv"),
}
buildoptions {
"-Wunused-value",
"-Wundef",
"--sysroot=$(FREEDOM_E_SDK)/toolchain/riscv32-unknown-elf",
"--sysroot=$(FREEDOM_E_SDK)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/riscv64-unknown-elf",
}
buildoptions_cpp {
"-std=c++11",
@@ -1333,7 +1333,7 @@ function strip()
configuration { "riscv" }
postbuildcommands {
"$(SILENT) echo Stripping symbols.",
"$(SILENT) $(FREEDOM_E_SDK)/toolchain/bin/riscv32-unknown-elf-strip -s \"$(TARGET)\""
"$(SILENT) $(FREEDOM_E_SDK)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/bin/riscv64-unknown-elf-strip -s \"$(TARGET)\""
}
configuration {} -- reset configuration