Fix windres not finding gcc

Author: Filippo Cremonese

.orchestra/config/components/toolchain/lib/binutils.lib.yml

@@ -9,11 +9,13 @@
 #@   toolchain_name=mandatory,
 #@   triple=mandatory,
 #@   binutils_version=mandatory,
+#@   gcc_version=mandatory,
 #@   extra_binutils_configure_options="",
 #@   binutils_sysroot=None,
 #@   ):
 #@   source_url = "https://ftp.gnu.org/gnu/binutils/binutils-" + binutils_version + ".tar.bz2"
 #@   binutils_sysroot = binutils_sysroot or "$ORCHESTRA_ROOT/" + triple
+#@   bindir = "${ORCHESTRA_ROOT}/x86_64-pc-linux-gnu/" + triple + "/binutils-bin/" + binutils_version
 license: COPYING
 configure: |
   extract.sh --into "$SOURCE_DIR" (@= source_url @)
@@ -27,7 +29,7 @@ configure: |
     --datadir=$ORCHESTRA_ROOT/share/binutils-data/(@= triple @)/(@= binutils_version @) \
     --infodir=$ORCHESTRA_ROOT/share/binutils-data/(@= triple @)/(@= binutils_version @)/info \
     --mandir=$ORCHESTRA_ROOT/share/binutils-data/(@= triple @)/(@= binutils_version @)/man \
-    --bindir=$ORCHESTRA_ROOT/x86_64-pc-linux-gnu/(@= triple @)/binutils-bin/(@= binutils_version @) \
+    --bindir=(@= bindir @) \
     --libdir=$ORCHESTRA_ROOT/lib64/binutils/(@= triple @)/(@= binutils_version @) \
     --libexecdir=$ORCHESTRA_ROOT/lib64/binutils/(@= triple @)/(@= binutils_version @) \
     --includedir=$ORCHESTRA_ROOT/lib64/binutils/(@= triple @)/(@= binutils_version @)/include \
@@ -51,9 +53,14 @@ configure: |
     (@= expand_args(extra_binutils_configure_options) @) \
     CFLAGS="-w -ggdb3 -O3" \
     CXXFLAGS="-w -ggdb3 -O3"
+post_install: |
+  (@- if "win" in toolchain_name: @)
+  # Symlink needed for making windres use the right gcc
+  ln -s "../../gcc-bin/(@= gcc_version @)/(@= triple @)-gcc" "${TMP_ROOT}(@= bindir @)/(@= triple @)-gcc"
+  (@ end -@)
 build_system: make
 add_to_path:
-  - ${ORCHESTRA_ROOT}/x86_64-pc-linux-gnu/(@= triple @)/binutils-bin/(@= binutils_version @)
+  - #@ bindir
 build_dependencies:
   - glibc
   - toolchain/host/gcc

.orchestra/config/components/toolchain/lib/toolchain.lib.yml

@@ -38,7 +38,7 @@
 #@ ):
 
 #@ if/end binutils_version:
-(@= "toolchain/" + toolchain_name + "/binutils" @): #@ create_binutils_component(toolchain_name=toolchain_name, triple=triple, binutils_version=binutils_version, extra_binutils_configure_options=extra_binutils_configure_options, binutils_sysroot=binutils_sysroot)
+(@= "toolchain/" + toolchain_name + "/binutils" @): #@ create_binutils_component(toolchain_name=toolchain_name, triple=triple, binutils_version=binutils_version, extra_binutils_configure_options=extra_binutils_configure_options, binutils_sysroot=binutils_sysroot, gcc_version=gcc_version)
 
 #@ if/end gdb_version:
 (@= "toolchain/" + toolchain_name + "/gdb" @): #@ create_gdb_component(triple=triple, gdb_version=gdb_version)