summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2021-09-22 17:30:04 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2021-09-22 17:30:04 +0200
commit81929ee392c44a6bbaa082d228d44e3abbe8d7e2 (patch)
tree858ca04fc71635657008d2fef8e686e8ca1c3508 /examples
parent7e6e240bb5eb76638a54525497d8efd3e3cd0bc2 (diff)
downloadrebel-81929ee392c44a6bbaa082d228d44e3abbe8d7e2.tar
rebel-81929ee392c44a6bbaa082d228d44e3abbe8d7e2.zip
Rename target_triple to gnu_triplet
Diffstat (limited to 'examples')
-rw-r--r--examples/binutils.yml6
-rw-r--r--examples/gcc-libs.yml4
-rw-r--r--examples/gcc.yml8
-rw-r--r--examples/glibc.yml6
-rw-r--r--examples/libgcc-initial.yml4
5 files changed, 14 insertions, 14 deletions
diff --git a/examples/binutils.yml b/examples/binutils.yml
index 422a108..2d4a980 100644
--- a/examples/binutils.yml
+++ b/examples/binutils.yml
@@ -13,9 +13,9 @@ tasks:
mkdir binutils-build
cd binutils-build
../binutils-2.37/configure \
- --build={{build.target_triple}} \
- --host={{host.target_triple}} \
- --target={{target.target_triple}} \
+ --build={{build.gnu_triplet}} \
+ --host={{host.gnu_triplet}} \
+ --target={{target.gnu_triplet}} \
--prefix={{host.prefix}} \
--with-sysroot={{sysroot}} \
--enable-libssp \
diff --git a/examples/gcc-libs.yml b/examples/gcc-libs.yml
index b9e9e52..c7f754a 100644
--- a/examples/gcc-libs.yml
+++ b/examples/gcc-libs.yml
@@ -27,5 +27,5 @@ tasks:
make DESTDIR={{destdir}}/host install-target-libgcc install-target-libstdc++-v3 install-target-libgomp install-target-libquadmath install-target-libatomic
mkdir -p {{destdir}}/target/{{target.prefix}}
- mv {{destdir}}/host{{host.prefix}}/{{target.target_triple}}/* {{destdir}}/target/{{target.prefix}}
- rmdir {{destdir}}/host{{host.prefix}}/{{target.target_triple}}
+ mv {{destdir}}/host{{host.prefix}}/{{target.gnu_triplet}}/* {{destdir}}/target/{{target.prefix}}
+ rmdir {{destdir}}/host{{host.prefix}}/{{target.gnu_triplet}}
diff --git a/examples/gcc.yml b/examples/gcc.yml
index 8dac894..1e6efaa 100644
--- a/examples/gcc.yml
+++ b/examples/gcc.yml
@@ -26,15 +26,15 @@ tasks:
mkdir gcc-build
cd gcc-build
../gcc-11.2.0/configure \
- --build={{build.target_triple}} \
- --host={{host.target_triple}} \
- --target={{target.target_triple}} \
+ --build={{build.gnu_triplet}} \
+ --host={{host.gnu_triplet}} \
+ --target={{target.gnu_triplet}} \
--prefix={{host.prefix}} \
--libdir={{host.prefix}}/lib \
--libexecdir={{host.prefix}}/lib \
--with-sysroot={{sysroot}} \
--with-native-system-header-dir={{target.prefix}}/include \
- --with-build-time-tools={{host.prefix}}/{{target.target_triple}}/bin \
+ --with-build-time-tools={{host.prefix}}/{{target.gnu_triplet}}/bin \
--with-gnu-ld \
--enable-shared \
--enable-languages=c,c++ \
diff --git a/examples/glibc.yml b/examples/glibc.yml
index 6c2ca8d..0ab133e 100644
--- a/examples/glibc.yml
+++ b/examples/glibc.yml
@@ -15,7 +15,7 @@ tasks:
depends:
- task: 'linux-uapi-headers:install'
run: |
- CROSS_COMPILE={{build.prefix}}/bin/{{host.target_triple}}-
+ CROSS_COMPILE={{build.prefix}}/bin/{{host.gnu_triplet}}-
export BUILD_CC=gcc
export CC=${CROSS_COMPILE}gcc
@@ -28,8 +28,8 @@ tasks:
mkdir glibc-build
cd glibc-build
../glibc-2.34/configure \
- --build={{build.target_triple}} \
- --host={{host.target_triple}} \
+ --build={{build.gnu_triplet}} \
+ --host={{host.gnu_triplet}} \
--prefix={{host.prefix}} \
--includedir={{host.prefix}}/include \
--libdir={{host.prefix}}/lib \
diff --git a/examples/libgcc-initial.yml b/examples/libgcc-initial.yml
index cf26211..2852179 100644
--- a/examples/libgcc-initial.yml
+++ b/examples/libgcc-initial.yml
@@ -19,7 +19,7 @@ tasks:
sed -i -r \
-e 's@^(thread_header =).*@\1 gthr-single.h@' \
-e 's@^(enable_shared =).*@\1 no@' \
- {{target.target_triple}}/libgcc/Makefile
+ {{target.gnu_triplet}}/libgcc/Makefile
compile:
inherit:
@@ -42,4 +42,4 @@ tasks:
run: |
cd gcc-build
make DESTDIR={{destdir}} install-target-libgcc
- ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.target_triple}}/11.2.0/libgcc_eh.a
+ ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.gnu_triplet}}/11.2.0/libgcc_eh.a