Fix windres not finding gcc

Author: Filippo Cremonese

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

@@ -14,6 +14,7 @@
 #@   ):
 #@   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 +28,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 \
@@ -53,7 +54,7 @@ configure: |
     CXXFLAGS="-w -ggdb3 -O3"
 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/gcc.lib.yml

@@ -79,6 +79,7 @@
 #@    extra_gcc_stage2_configure_options="",
 #@    gcc_sysroot = None,
 #@    extra_gcc_make_variables = "",
+#@    binutils_version = None,
 #@  ):
 
 #@    source_url = "https://ftp.gnu.org/gnu/gcc/gcc-" + gcc_version + "/gcc-" + gcc_version + ".tar.gz"
@@ -96,6 +97,10 @@
 #@ dependencies = gcc_dependencies(stage, toolchain_name, musl_version, uclibc_version, linux_version, mingw64_version) or []
 #@ build_dependencies = gcc_build_dependencies(stage, toolchain_name) or []
 
+#@ if "win" in toolchain_name:
+#@   binutils_bindir = "${ORCHESTRA_ROOT}/x86_64-pc-linux-gnu/" + triple + "/binutils-bin/" + binutils_version
+#@ end
+
 #! The sed is required to make `--sysroot=/` work with `--with-gxx-include-dir`
 #! properly.
 configure: |
@@ -197,7 +202,11 @@ install: |
 
   # Fixinclude locates the wrong pthread.h
   find "${DESTDIR}${ORCHESTRA_ROOT}" -type d -name include-fixed -exec rm -f {}/pthread.h \;
-
+  (@- if "win" in toolchain_name: @)
+  # Symlink needed for making windres use the right gcc
+  mkdir -p "${TMP_ROOT}(@= binutils_bindir @)"
+  ln -s "../../gcc-bin/(@= gcc_version @)/(@= triple @)-gcc" "${TMP_ROOT}(@= binutils_bindir @)/(@= triple @)-gcc"
+  (@ end -@)
 dependencies: #@ dependencies
 build_dependencies: #@ build_dependencies
 #@ end

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

@@ -47,7 +47,7 @@
 (@= "toolchain/" + toolchain_name + "/linux-headers" @): #@ create_linux_headers_component(triple=triple, linux_version=linux_version, arch_name=linux_arch_name)
 
 #@ if/end gcc_version:
-(@= "toolchain/" + toolchain_name + "/gcc" @): #@ create_gcc_component(toolchain_name=toolchain_name, triple=triple, gcc_sysroot=gcc_sysroot, gcc_version=gcc_version, extra_gcc_configure_options=extra_gcc_configure_options, extra_gcc_stage2_configure_options=extra_gcc_stage2_configure_options, extra_gcc_make_variables=extra_gcc_make_variables, musl_version=musl_version, uclibc_version=uclibc_version, linux_version=linux_version, mingw64_version=mingw64_version)
+(@= "toolchain/" + toolchain_name + "/gcc" @): #@ create_gcc_component(toolchain_name=toolchain_name, triple=triple, gcc_sysroot=gcc_sysroot, gcc_version=gcc_version, extra_gcc_configure_options=extra_gcc_configure_options, extra_gcc_stage2_configure_options=extra_gcc_stage2_configure_options, extra_gcc_make_variables=extra_gcc_make_variables, musl_version=musl_version, uclibc_version=uclibc_version, linux_version=linux_version, mingw64_version=mingw64_version, binutils_version=binutils_version)
 
 #@ if/end mingw64_version:
 _: #@ template.replace(create_mingw64_components(toolchain_name=toolchain_name, triple=triple, mingw64_version=mingw64_version, gcc_version=gcc_version))