Skip to content
Snippets Groups Projects
Commit 45b14bfe authored by Filippo Cremonese's avatar Filippo Cremonese
Browse files

Introduce toolchain meta-components

Introduce host-c-toolchain, host-cxx-toolchain, and host-libcxx
metacomponents, meant to be used to depend on a generic c/c++/libc++ is
available.
Also introduce gcc-host-toolchain, providing host gcc and binutils.
parent 85d8b93a
No related branches found
No related tags found
No related merge requests found
Showing
with 84 additions and 35 deletions
......@@ -26,9 +26,11 @@ install: |
cxxflags='(@= data.values.regular_cxx_flags @)' \
linkflags='(@= data.values.regular_linker_flags @) -Wl,-rpath=$ORIGIN/../lib' \
install
build_dependencies:
- host-cxx-toolchain
- glibc
dependencies:
- clang-release
- toolchain/host/gcc
- host-libcxx
- libunwind
#@ end
......
......@@ -8,8 +8,9 @@ extra_cmake_args: #@ cmake_boost_configuration
build_dependencies:
- cmake
- glibc
- host-cxx-toolchain
dependencies:
- clang-release
- host-libcxx
- llvm
- revng
- revng-c
......
......@@ -41,8 +41,7 @@ install: |
build_dependencies:
- cmake
dependencies:
- toolchain/host/gcc
- toolchain/host/binutils
- gcc-host-toolchain
- libunwind
#@ end
......
......@@ -22,8 +22,8 @@ configure: |
-DCMAKE_CXX_FLAGS="(@= data.values.use_old_glibc_cflags @)" \
-DCMAKE_USE_OPENSSL=OFF
build_system: make
dependencies:
- toolchain/host/gcc
build_dependencies:
- gcc-host-toolchain
#@ end
#@overlay/match by=overlay.all, expects=1
......
......@@ -23,9 +23,9 @@ configure: |
LDFLAGS="(@= data.values.use_old_glibc_lflags @) (@= data.values.modern_linker_flags @) -Wl,-rpath,$RPATH_PLACEHOLDER/lib"
build_system: make
build_dependencies:
- host-c-toolchain
- glibc
dependencies:
- toolchain/host/gcc
- zlib
#@ end
......
......@@ -43,8 +43,10 @@ install: |
export LANG=
(@= ninja @)
(@= ninja @) install
build_dependencies:
- host-c-toolchain
- glibc
dependencies:
- clang-release
- libffi
- zlib
#@ end
......
......@@ -21,8 +21,9 @@ configure: |
CFLAGS="(@= data.values.use_old_glibc_cflags @)" \
LDFLAGS="(@= data.values.use_old_glibc_lflags @) (@= data.values.modern_linker_flags @) -Wl,-rpath,$RPATH_PLACEHOLDER/lib"
build_system: make
dependencies:
- toolchain/host/gcc
build_dependencies:
- host-c-toolchain
- glibc
#@ end
#@overlay/match by=overlay.all, expects=1
......
......@@ -18,8 +18,9 @@ configure: |
CFLAGS="(@= data.values.use_old_glibc_cflags @) -Wno-error" \
LDFLAGS="(@= data.values.use_old_glibc_lflags @) (@= data.values.modern_linker_flags @) -Wl,-rpath,$RPATH_PLACEHOLDER/lib"
build_system: make
dependencies:
- toolchain/host/gcc
build_dependencies:
- host-c-toolchain
- glibc
#@ end
#@overlay/match by=overlay.all, expects=1
......
......@@ -27,8 +27,9 @@ configure: |
CFLAGS="(@= data.values.use_old_glibc_cflags @)" \
LDFLAGS="(@= data.values.use_old_glibc_lflags @) (@= data.values.modern_linker_flags @) -Wl,-rpath,$RPATH_PLACEHOLDER/lib"
build_system: make
dependencies:
- toolchain/host/gcc
build_dependencies:
- gcc-host-toolchain
- glibc
#@ end
#@overlay/match by=overlay.all, expects=1
......
......@@ -38,9 +38,9 @@ builds:
fi
build_dependencies:
- cmake
- host-cxx-toolchain
dependencies:
- toolchain/host/gcc
- clang-release
- host-libcxx
- libunwind
#@ if/end ndebug == False:
ndebug: false
......
......@@ -24,8 +24,8 @@ macos/(@= prefix @)-clang:
rm -f "${TMP_ROOT}${ORCHESTRA_ROOT}/bin/(@= prefix @)-apple-darwin11-clang++"
cp "$ORCHESTRA_DOTDIR/support/add-sysroot-wrapper.sh" "${TMP_ROOT}${ORCHESTRA_ROOT}/bin/(@= prefix @)-apple-darwin11-clang++"
dependencies:
- macos/sdk
- clang-release
- macos/sdk
- macos/(@= prefix @)-ld64
#@ end
#@ end
......@@ -44,9 +44,10 @@ macos/(@= prefix @)-ld64:
cd "$BUILD_DIR/cctools"
(@= make @)
(@= make @) install
build_dependencies:
- host-cxx-toolchain
dependencies:
- host-libcxx
- macos/libtapi
- clang-release
- toolchain/host/gcc
#@ end
#@ end
......@@ -33,7 +33,7 @@ builds:
cp -a projects/libtapi/include/tapi/Version.inc "${TMP_ROOT}${ORCHESTRA_ROOT}/include/tapi/"
build_dependencies:
- cmake
- host-cxx-toolchain
dependencies:
- clang-release
- toolchain/host/gcc
- host-libcxx
#@ end
......@@ -11,10 +11,5 @@ builds:
# echo "TODO: macosx sdk" && exit 1
# create-package.sh Xcode_9.xip
extract.sh --into "${TMP_ROOT}${ORCHESTRA_ROOT}" "(@= sdk_archive_name @)"
build_dependencies:
- cmake
dependencies:
- clang-release
- toolchain/host/gcc
add_to_path: "$ORCHESTRA_DOTDIR/support/repackage-apple-sdk"
#@ end
......@@ -40,9 +40,12 @@ builds:
install: |
cd "$BUILD_DIR"
(@= make @) install
dependencies:
- llvm
build_dependencies:
- host-c-toolchain
- clang-release
- glibc
- llvm
dependencies:
- zlib
- glib
#@ if/end ndebug == False:
......
......@@ -7,8 +7,9 @@ extra_cmake_args: #@ cmake_boost_configuration
build_dependencies:
- revng-qa
- glibc
- host-cxx-toolchain
dependencies:
- toolchain/host/gcc
- host-libcxx
- llvm
- qemu
- boost
......
......@@ -7,9 +7,9 @@ extra_cmake_args: #@ cmake_boost_configuration
build_dependencies:
- cmake
- glibc
- host-cxx-toolchain
dependencies:
- toolchain/host/gcc
- clang-release
- host-libcxx
- revng
- boost
- revng-qa
......
......@@ -20,9 +20,10 @@ configure: |
build_system: make
build_dependencies:
- cmake
dependencies:
- clang-release
- host-cxx-toolchain
- glibc
- qemu
dependencies:
- toolchain/x86-64/gcc
- toolchain/i386/gcc
- toolchain/arm/gcc
......
#@ load("@ytt:data", "data")
#@ load("@ytt:overlay", "overlay")
#@ load("@ytt:template", "template")
#@ load("/components/toolchain/lib/toolchain.lib.yml", "create_toolchain_components")
#@yaml/text-templated-strings
......@@ -47,4 +48,14 @@ extra_gcc_make_variables: LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
#@overlay/match by=overlay.all, expects=1
#@overlay/match-child-defaults missing_ok=True
---
components: #@ create_toolchain_components(**params())
components:
_: #@ template.replace(create_toolchain_components(**params()))
gcc-host-toolchain:
builds:
default:
dependencies:
- toolchain/host/gcc
- toolchain/host/binutils
install: exit 0
configure: mkdir -p "$BUILD_DIR"
#@ load("@ytt:overlay", "overlay")
#@overlay/match by=overlay.all, expects=1
#@overlay/match-child-defaults missing_ok=True
---
components:
host-c-toolchain:
builds:
default:
dependencies:
- clang-release
install: exit 0
configure: mkdir -p "$BUILD_DIR"
host-cxx-toolchain:
builds:
default:
dependencies:
- clang-release
install: exit 0
configure: mkdir -p "$BUILD_DIR"
host-libcxx:
builds:
default:
dependencies:
- clang-release
- toolchain/host/gcc
install: exit 0
configure: mkdir -p "$BUILD_DIR"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment