Update llvm and rust recipes

This commit is contained in:
Jeremy Soller 2018-12-14 20:07:46 -07:00
parent 063966aaf5
commit 07ab7dae62
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
4 changed files with 14 additions and 7 deletions

View File

@ -8,6 +8,7 @@ source config.sh
export BINDIR=bin
export CARGOFLAGS=
export DEBUG=
export PREPARE_COPY=1
if [ ! "$(uname -s)" = "Redox" ]
then
@ -250,7 +251,12 @@ function op {
fi
rm -rf build
cp -rp source build
if [ "$PREPARE_COPY" -eq "0" ]
then
mkdir build
else
cp -rp source build
fi
for patch in *.patch
do

View File

@ -40,8 +40,6 @@ function recipe_build {
-DLLVM_INCLUDE_EXAMPLES=Off
-DLLVM_BUILD_TESTS=Off
-DLLVM_INCLUDE_TESTS=Off
-DLLVM_BUILD_TOOLS=Off
-DLLVM_INCLUDE_TOOLS=Off
-DLLVM_BUILD_UTILS=Off
-DLLVM_INCLUDE_UTILS=Off
-target="$HOST"

View File

@ -10,11 +10,11 @@ prefix = os.path.realpath(os.path.dirname(os.path.abspath(sys.argv[0])) + "/sysr
# This is a hack, and should be replaced if possible.
if args == ["--version"]:
print("8.0.0")
print("8.0.0svn")
elif args == ["--cxxflags"]:
print("-I" + prefix + "/include --std=gnu++11 -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment -Werror=date-time -std=gnu++11 -g -fno-exceptions -fno-rtti -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS")
print("-I" + prefix + "/include --std=gnu++11 -fPIC -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-comment -g -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS")
elif args == ["--components"]:
print("all all-targets analysis asmparser asmprinter bitreader bitwriter codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfomsf debuginfopdb demangle engine executionengine globalisel instcombine instrumentation interpreter ipo irreader libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser mirparser native nativecodegen objcarcopts object objectyaml option orcjit passes profiledata runtimedyld scalaropts selectiondag support symbolize tablegen target transformutils vectorize x86 x86asmparser x86asmprinter x86codegen x86desc x86disassembler x86info x86utils")
print("aggressiveinstcombine all all-targets analysis asmparser asmprinter binaryformat bitreader bitwriter codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel instcombine instrumentation interpreter ipo irreader libdriver lineeditor linker lto mc mcdisassembler mcjit mcparser mirparser native nativecodegen objcarcopts object objectyaml option orcjit passes profiledata runtimedyld scalaropts selectiondag support symbolize tablegen target transformutils vectorize windowsmanifest x86 x86asmparser x86asmprinter x86codegen x86desc x86disassembler x86info x86utils")
elif args == ['--libs', '--link-static', 'asmparser', 'bitreader', 'bitwriter', 'instrumentation', 'interpreter', 'ipo', 'linker', 'lto', 'mcjit', 'x86']:
print(
"-lLLVMLTO -lLLVMObjCARCOpts -lLLVMPasses -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen"

View File

@ -2,6 +2,7 @@ GIT=https://gitlab.redox-os.org/redox-os/rust.git
BRANCH=compile-redox
BUILD_DEPENDS=(llvm)
DEPENDS="gcc cargo"
PREPARE_COPY=0
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@ -14,8 +15,10 @@ function recipe_update {
}
function recipe_build {
config="$(realpath ../config.toml)"
source="$(realpath ../source)"
unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP
python x.py dist --config ../config.toml --jobs $(nproc) --incremental --keep-stage 0
python "$source/x.py" dist --config "$config" --jobs $(nproc) --incremental
skip=1
}