From d852866555d6b7d138a7b25b5feb7f4d79447716 Mon Sep 17 00:00:00 2001 From: "Koenig, Joerg" Date: Mon, 22 Jun 2020 08:23:38 +0200 Subject: Merged changes from master Change-Id: Ie75ce07fc69fe75a7d8f7ff80f5a0c4f5d8036bd --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2e2d75e..e87e0bf 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ lingcc-binutils: cd $(BUILD_DIR)/binutils ;\ LDLAGS="-static-libgcc -static-libstdc++" \ $(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \ - --with-pkgversion=$(GCC_PKGVERSION) \ + --with-pkgversion="$(GCC_PKGVERSION)" \ --prefix=$(INST_BASE)/gcc \ --disable-nls \ --enable-deterministic-archives \ @@ -228,7 +228,7 @@ lingcc-gcc: cd $(BUILD_DIR)/gcc && \ LDLAGS="-static-libgcc -static-libstdc++" \ $(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \ - --with-pkgversion=$(GCC_PKGVERSION) \ + --with-pkgversion="$(GCC_PKGVERSION)" \ --prefix=$(INST_BASE)/gcc \ --build=$(ARCH64) \ --host=$(ARCH64) \ @@ -327,7 +327,7 @@ xgcc-build-binutils: CFLAGS="-O2 -pipe" \ CXXFLAGS="-O2 -pipe" \ $(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \ - --with-pkgversion=$(GCC_PKGVERSION) \ + --with-pkgversion="$(GCC_PKGVERSION)" \ --prefix=$(XGCC_INST_DIR) \ --disable-nls \ --enable-deterministic-archives \ @@ -407,7 +407,7 @@ xgcc-gcc-pass1: CFLAGS="-O2 -pipe" \ CXXFLAGS="-O2 -pipe" \ $(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \ - --with-pkgversion=$(GCC_PKGVERSION) \ + --with-pkgversion="$(GCC_PKGVERSION)" \ --prefix=$(XGCC_INST_DIR) \ --with-sysroot=$(XGCC_INST_DIR) \ --disable-nls \ @@ -637,7 +637,7 @@ wingcc-binutils: CC=$(XGCC64) CXX=$(XGPP64) \ LDLAGS="-static-libgcc -static-libstdc++" \ $(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \ - --with-pkgversion=$(GCC_PKGVERSION) \ + --with-pkgversion="$(GCC_PKGVERSION)" \ --prefix=$(WINGCC_INST_DIR) \ --disable-nls \ --enable-deterministic-archives \ @@ -705,6 +705,8 @@ wingcc-pthread-64: make $(JOBS) install cp -f $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/bin/libwinpthread-1.dll \ $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib + cp -f $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/bin/libwinpthread-1.dll \ + $(WINGCC_INST_DIR)/bin wingcc-gcc: rm -Rf $(BUILD_DIR)/gcc && mkdir -p $(BUILD_DIR)/gcc @@ -713,7 +715,7 @@ wingcc-gcc: CC=$(XGCC64) CXX=$(XGPP64) \ LDLAGS="-static-libgcc -static-libstdc++" \ $(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \ - --with-pkgversion=$(GCC_PKGVERSION) \ + --with-pkgversion="$(GCC_PKGVERSION)" \ --prefix=$(WINGCC_INST_DIR) \ --with-sysroot=$(WINGCC_INST_DIR) \ --disable-nls \ -- cgit v0.12