mirror of
https://github.com/skeeto/w64devkit.git
synced 2026-10-23 06:08:56 +03:00
Rename the crossgcc patch queue to gcc-final
"crossgcc" names a property both GCC builds share: /x-gcc is a plain cross build and /gcc is a Canadian cross, so "cross" does not tell them apart, and it points at the bootstrap compiler, which is the one queue it does not apply to. What separates the queues is reach. Both push onto the same tree, which is never popped: src/gcc goes on before the bootstrap compiler and is still applied when the shipped compiler configures, so it reaches both. The second queue goes on top afterward and reaches only the compiler that ships. Name it for that. As a bonus the directories now sort in push order; crossgcc sorted before gcc while being applied after it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -241,7 +241,7 @@ COPY src/binutils/ $PREFIX/src/binutils/
|
||||
# Patch queues are applied with quilt, ordered by each queue's series
|
||||
# file. The .pc/ state is removed after each push: source trees are
|
||||
# never popped, and a stale .pc would block pushing a second queue
|
||||
# onto the same tree later (gcc then crossgcc, mingw then gendef).
|
||||
# onto the same tree later (gcc then gcc-final, mingw then gendef).
|
||||
RUN sed -ri 's/(static bool insert_timestamp = )/\1!/' ld/emultempl/pe*.em \
|
||||
&& sed -ri 's/(int pe_enable_stdcall_fixup = )/\1!!/' ld/emultempl/pe*.em \
|
||||
&& QUILT_PATCHES=$PREFIX/src/binutils quilt push -a \
|
||||
@@ -506,9 +506,9 @@ RUN if [ "$GCC_MULTILIB" = enable ]; then \
|
||||
fi
|
||||
|
||||
WORKDIR /gcc
|
||||
COPY src/crossgcc/ $PREFIX/src/crossgcc/
|
||||
COPY src/gcc-final/ $PREFIX/src/gcc-final/
|
||||
RUN (cd /dl/gcc \
|
||||
&& QUILT_PATCHES=$PREFIX/src/crossgcc quilt push -a \
|
||||
&& QUILT_PATCHES=$PREFIX/src/gcc-final quilt push -a \
|
||||
&& rm -rf .pc) \
|
||||
&& /dl/gcc/configure \
|
||||
--prefix=$PREFIX \
|
||||
|
||||
Reference in New Issue
Block a user