From 2e45ac2861b4ab9a32a11e25a9bcfdc94d605bb4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Sep 2021 10:32:36 +0200
Subject: gcc-libs: split install step into toolchain and sysroot components

Make the sysroot components usable as a regular dependency.
---
 examples/gcc-libs.yml  | 27 ++++++++++++++++++---------
 examples/toolchain.yml |  7 +------
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'examples')

diff --git a/examples/gcc-libs.yml b/examples/gcc-libs.yml
index 953a097..bc352a6 100644
--- a/examples/gcc-libs.yml
+++ b/examples/gcc-libs.yml
@@ -17,7 +17,7 @@ tasks:
       cd gcc-build
       make -j8 all-target-libgcc all-target-libstdc++-v3 all-target-libgomp all-target-libquadmath all-target-libatomic
 
-  install:
+  install-gcc:
     args:
       host: 'platform'
       target: 'platform'
@@ -32,14 +32,23 @@ tasks:
         args:
           host: 'target'
     output:
-      host:
-        path: 'host'
-      target:
-        path: 'target'
+      default: {}
     run: |
       cd gcc-build
-      make DESTDIR={{destdir}}/host install-target-libgcc install-target-libstdc++-v3 install-target-libgomp install-target-libquadmath install-target-libatomic
+      make DESTDIR={{destdir}} install-target-libgcc install-target-libstdc++-v3 install-target-libgomp install-target-libquadmath install-target-libatomic
+
+      mv {{destdir}}{{host.prefix}}/{{target.gnu_triplet}} ../gcc-sysroot
 
-      mkdir -p {{destdir}}/target/{{target.prefix}}
-      mv {{destdir}}/host{{host.prefix}}/{{target.gnu_triplet}}/* {{destdir}}/target/{{target.prefix}}
-      rmdir {{destdir}}/host{{host.prefix}}/{{target.gnu_triplet}}
+  install:
+    args:
+      host: 'platform'
+    inherit:
+      task: 'gcc-libs:install-gcc'
+      args:
+        host: 'build'
+        target: 'host'
+    output:
+      default: {}
+    run: |
+      mkdir -p {{destdir}}{{host.prefix}}
+      cp -a gcc-sysroot/* {{destdir}}{{host.prefix}}
diff --git a/examples/toolchain.yml b/examples/toolchain.yml
index 334e5f1..ea9f41f 100644
--- a/examples/toolchain.yml
+++ b/examples/toolchain.yml
@@ -4,13 +4,8 @@ tasks:
       host: 'platform'
     build_depends:
       - task: 'gcc:install'
-      - task: 'gcc-libs:install'
-        output: 'host'
+      - task: 'gcc-libs:install-gcc'
     depends:
       - task: 'glibc:install'
       - task: 'gcc-libs:install'
-        output: 'target'
-        args:
-          host: 'build'
-          target: 'host'
     run: ''
-- 
cgit v1.2.3