mirror of
https://github.com/skeeto/w64devkit.git
synced 2026-10-23 06:08:56 +03:00
Introduce etc/ in the sysroot
This is where src/profile *really* belongs, and I have plans for more etc/ entries.
This commit is contained in:
@@ -781,6 +781,7 @@ COPY --from=build-cmake /out$PREFIX/ $PREFIX/
|
||||
COPY --from=build-7z /dl/7z/7z.sfx /7z/
|
||||
|
||||
COPY src $PREFIX/src
|
||||
COPY etc $PREFIX/etc
|
||||
|
||||
WORKDIR /
|
||||
RUN rm -rf $PREFIX/share/man/ $PREFIX/share/info/ $PREFIX/share/gcc-*
|
||||
@@ -814,7 +815,7 @@ RUN printf "id ICON \"$PREFIX/src/w64devkit.ico\"" >w64devkit.rc \
|
||||
&& $ARCH-gcc -DEXE=pkg-config.exe -DCMD=pkg-config \
|
||||
-Oz -fno-asynchronous-unwind-tables -Wl,--gc-sections -s -nostdlib \
|
||||
-o $PREFIX/bin/$ARCH-pkg-config.exe $PREFIX/src/alias.c -lkernel32 \
|
||||
&& sed -i s/'\<ARCH\>'/$ARCH/g $PREFIX/src/profile \
|
||||
&& sed -i s/'\<ARCH\>'/$ARCH/g $PREFIX/etc/profile \
|
||||
&& mkdir -p $PREFIX/lib/pkgconfig \
|
||||
&& cp /dl/mingw/COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt \
|
||||
$PREFIX/ \
|
||||
|
||||
@@ -3,5 +3,5 @@
|
||||
@@ -16349,3 +16349,3 @@
|
||||
|
||||
- hp = exe_relative_path("/etc/profile");
|
||||
+ hp = exe_relative_path("../src/profile");
|
||||
+ hp = exe_relative_path("../etc/profile");
|
||||
read_profile(hp);
|
||||
|
||||
Reference in New Issue
Block a user