diff options
| -rw-r--r-- | Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -375,6 +375,7 @@ win-gcc-binutils: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-win-binutils cd $(TOP)/build-x86_64-w64-mingw32/build-win-binutils && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ $(TOP)/build-x86_64-w64-mingw32/.build/src/binutils-$(VERSION_BINUTILS)/configure \ --with-pkgversion=$(PKGVERSION) \ @@ -399,6 +400,7 @@ win-gcc-mingw: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-win-mingw cd $(TOP)/build-x86_64-w64-mingw32/build-win-mingw && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ $(TOP)/build-x86_64-w64-mingw32/.build/src/mingw-w64-$(VERSION_MINGW)/configure \ --prefix=$(TOP)/1_INST/x86-mingw64/x86_64-w64-mingw32 \ @@ -426,6 +428,7 @@ win-gcc-gmp: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-win-gmp cd $(TOP)/build-x86_64-w64-mingw32/build-win-gmp && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ $(TOP)/build-x86_64-w64-mingw32/.build/src/gmp-$(VERSION_GMP)/configure \ --prefix=$(TOP)/1_INST/x86-mingw64 \ @@ -446,6 +449,7 @@ win-gcc-mpfr: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-win-mpfr cd $(TOP)/build-x86_64-w64-mingw32/build-win-mpfr && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ $(TOP)/build-x86_64-w64-mingw32/.build/src/mpfr-$(VERSION_MPFR)/configure \ --prefix=$(TOP)/1_INST/x86-mingw64 \ @@ -469,6 +473,7 @@ win-gcc-mpc: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-win-mpc cd $(TOP)/build-x86_64-w64-mingw32/build-win-mpc && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ $(TOP)/build-x86_64-w64-mingw32/.build/src/mpc-$(VERSION_MPC)/configure \ --prefix=$(TOP)/1_INST/x86-mingw64 \ @@ -492,6 +497,7 @@ win-gcc-isl: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-win-isl cd $(TOP)/build-x86_64-w64-mingw32/build-win-isl && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ $(TOP)/build-x86_64-w64-mingw32/.build/src/isl-$(VERSION_ISL)/configure \ --prefix=$(TOP)/1_INST/x86-mingw64 \ @@ -531,6 +537,7 @@ win-gcc-final: patch -p1 < $(TOP)/sources/gcc-undefined-LIBGCC_EH_FRAME_SECTION_NAME.patch cd $(TOP)/build-x86_64-w64-mingw32/build-win-gcc && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ $(TOP)/build-x86_64-w64-mingw32/unpack-win-gcc/configure \ --prefix=$(TOP)/1_INST/x86-mingw64 \ --with-pkgversion=$(PKGVERSION) \ @@ -584,6 +591,7 @@ win-gcc-make: patch -p1 < $(TOP)/patches/make-4.4.1-filter.patch && \ patch -p1 < $(TOP)/patches/make-4.4.1-win32-colors.patch && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ CFLAGS="-I../glob" \ LDFLAGS="-static -static-libgcc -static-libstdc++" \ $(TOP)/build-x86_64-w64-mingw32/build-win-gmake/configure \ @@ -599,6 +607,7 @@ win-gcc-genpeimg: mkdir -p $(TOP)/build-x86_64-w64-mingw32/genpeimg cd $(TOP)/build-x86_64-w64-mingw32/genpeimg && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ CC=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-gcc \ CXX=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-g++ \ AR=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-ar \ @@ -617,6 +626,7 @@ win-gcc-gendef: mkdir -p $(TOP)/build-x86_64-w64-mingw32/gendef cd $(TOP)/build-x86_64-w64-mingw32/gendef && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ CC=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-gcc \ CXX=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-g++ \ AR=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-ar \ @@ -634,6 +644,7 @@ win-gcc-genidl: mkdir -p $(TOP)/build-x86_64-w64-mingw32/genidl cd $(TOP)/build-x86_64-w64-mingw32/genidl && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ CC=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-gcc \ CXX=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-g++ \ AR=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-ar \ @@ -651,6 +662,7 @@ win-gcc-widl: mkdir -p $(TOP)/build-x86_64-w64-mingw32/widl cd $(TOP)/build-x86_64-w64-mingw32/widl && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ CC=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-gcc \ CXX=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-g++ \ AR=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-ar \ @@ -668,7 +680,7 @@ win-gcc-zlib: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-zlib64 cd $(TOP)/build-x86_64-w64-mingw32/build-zlib64 && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ - export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ CC=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-gcc \ CXX=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-g++ \ AR=$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-ar \ @@ -686,7 +698,7 @@ win-gcc-zlib: mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-zlib32 cd $(TOP)/build-x86_64-w64-mingw32/build-zlib32 && \ export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ - export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/lib:$(TOP)/1_INST/x86-linux64/lib64:$(LD_LIBRARY_PATH) && \ CC="$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-gcc -m32"\ CXX="$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-g++ -m32"\ AR="$(TOP)/1_INST/x86-linux64/bin/x86_64-w64-mingw32-ar"\ @@ -710,6 +722,7 @@ win-gcc-gdb: rm -Rf $(TOP)/build-x86_64-w64-mingw32/build-gdb mkdir -p $(TOP)/build-x86_64-w64-mingw32/build-gdb export PATH=$(TOP)/1_INST/x86-linux64/bin:$(PATH) && \ + export LD_LIBRARY_PATH=$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib:$(TOP)/1_INST/x86-linux64/x86_64-pc-linux-gnu/lib64:$(LD_LIBRARY_PATH) && \ cd $(TOP)/build-x86_64-w64-mingw32/build-gdb && \ $(TOP)/build-x86_64-w64-mingw32/.build/x86_64-w64-mingw32/src/gdb/configure \ CXXFLAGS="-g -O2 -fpermissive" \ |