diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-10-02 23:35:22 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-10-02 23:35:22 +0200 |
| commit | cf85af2115788710cd58e78466ec393c1fa95f2d (patch) | |
| tree | d9848827fd056a43d02fd4e1f9a2912bb5020f88 /examples | |
| parent | d8162b4319f210a3663fb4f0d78c111bdbbe50b2 (diff) | |
| download | rebel-cf85af2115788710cd58e78466ec393c1fa95f2d.tar rebel-cf85af2115788710cd58e78466ec393c1fa95f2d.zip | |
examples: gcc, gcc-libs: make recipes work with cross host build
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gcc-libs.yml | 15 | ||||
| -rw-r--r-- | examples/gcc.yml | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/examples/gcc-libs.yml b/examples/gcc-libs.yml index e2a9906..755f894 100644 --- a/examples/gcc-libs.yml +++ b/examples/gcc-libs.yml @@ -1,5 +1,6 @@ meta: name: 'gcc' + version: '11.2.0' tasks: compile: args: @@ -15,7 +16,7 @@ tasks: host: 'target' run: | cd {{pn}}-build - make -j8 all-target-libgcc all-target-libstdc++-v3 all-target-libgomp all-target-libquadmath all-target-libatomic + make -j8 all-target-libgcc all-target-libatomic all-target-libgomp all-target-libquadmath all-target-libstdc++-v3 install-gcc: args: @@ -27,9 +28,10 @@ tasks: default: {} run: | cd {{pn}}-build - 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 + make DESTDIR={{destdir}} install-target-libgcc + make DESTDIR={{workdir}}/install install-target-libatomic install-target-libgomp install-target-libquadmath install-target-libstdc++-v3 + mv {{destdir}}{{host_to_target.sysroot}}{{target.prefix}}/lib/libgcc_s.so* {{workdir}}/install/{{host_to_target.sysroot}}{{target.prefix}}/lib/ + rmdir -p --ignore-fail-on-non-empty {{destdir}}{{host_to_target.sysroot}}{{target.prefix}}/lib install: args: @@ -42,5 +44,6 @@ tasks: output: default: {} run: | - mkdir -p {{destdir}}{{host.prefix}} - cp -a gcc-sysroot/* {{destdir}}{{host.prefix}} + mkdir -p {{destdir}} + cp -a {{workdir}}/install/{{build_to_host.sysroot}}/* {{destdir}}/ + rm {{destdir}}{{host.prefix}}/lib/*.la diff --git a/examples/gcc.yml b/examples/gcc.yml index eb343f4..c11e2de 100644 --- a/examples/gcc.yml +++ b/examples/gcc.yml @@ -42,6 +42,8 @@ tasks: - task: 'header-stubs' noinherit: true run: | + export CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++" + mkdir {{pn}}-build cd {{pn}}-build ../{{pn}}-{{pv}}/configure \ @@ -52,9 +54,10 @@ tasks: --libdir={{host.prefix}}/lib \ --libexecdir={{host.prefix}}/lib \ --with-sysroot={{host_to_target.sysroot}} \ - --with-build-sysroot={{build_to_target.sysroot}} \ + --with-build-sysroot={{sysroot}} \ --with-native-system-header-dir={{target.prefix}}/include \ - --with-build-time-tools={{build.prefix}}/{{target.gnu_triplet}}/bin \ + --with-toolexeclibdir={{host_to_target.sysroot}}{{target.prefix}}/lib \ + --with-gxx-include-dir={{host_to_target.sysroot}}{{target.prefix}}/include/c++/"$(cat ../{{pn}}-{{pv}}/gcc/BASE-VER)" \ --with-gnu-ld \ --enable-shared \ --enable-languages=c,c++ \ |