Skip to content

Commit 2afae11

Browse files
authored
Fix msys symlink override rule (#59101)
The `export VAR=VAL` is syntax, so it can't be expanded. Fixes #59096
1 parent d5fdf04 commit 2afae11

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

deps/libgit2.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ifneq ($(USE_BINARYBUILDER_LIBGIT2),1)
44
LIBGIT2_GIT_URL := https://github.com/libgit2/libgit2.git
55
LIBGIT2_TAR_URL = https://api.github.com/repos/libgit2/libgit2/tarball/$1
66
$(eval $(call git-external,libgit2,LIBGIT2,CMakeLists.txt,,$(SRCCACHE)))
7-
$(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted: $(MSYS_NONEXISTENT_SYMLINK_TARGET_FIX)
7+
$(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted: export MSYS=$(MSYS_NONEXISTENT_SYMLINK_TARGET_FIX)
88

99
ifeq ($(USE_SYSTEM_LIBSSH2), 0)
1010
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/libssh2

deps/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $(eval $(call git-external,llvm,LLVM,CMakeLists.txt,,$(SRCCACHE)))
1414
# symlinks. We don't particularly care either way - we just need to symlinks
1515
# to succeed. We could guard this by a uname check, but it's harmless elsewhere,
1616
# so let's not incur the additional overhead.
17-
$(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted: $(MSYS_NONEXISTENT_SYMLINK_TARGET_FIX)
17+
$(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted: export MSYS=$(MSYS_NONEXISTENT_SYMLINK_TARGET_FIX)
1818

1919
LLVM_BUILDDIR := $(BUILDDIR)/$(LLVM_SRC_DIR)
2020
LLVM_BUILDDIR_withtype := $(LLVM_BUILDDIR)/build_$(LLVM_BUILDTYPE)

deps/tools/common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ endif
102102
# symlinks. We don't particularly care either way - we just need to symlinks
103103
# to succeed. We could guard this by a uname check, but it's harmless elsewhere,
104104
# so let's not incur the additional overhead.
105-
MSYS_NONEXISTENT_SYMLINK_TARGET_FIX := export MSYS=winsymlinks:native
105+
MSYS_NONEXISTENT_SYMLINK_TARGET_FIX := winsymlinks:native
106106

107107
# If the top-level Makefile is called with environment variables,
108108
# they will override the values passed above to ./configure

deps/zstd.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ifneq ($(USE_BINARYBUILDER_ZSTD), 1)
33
ZSTD_GIT_URL := https://github.com/facebook/zstd.git
44
ZSTD_TAR_URL = https://api.github.com/repos/facebook/zstd/tarball/$1
55
$(eval $(call git-external,zstd,ZSTD,,,$(BUILDDIR)))
6-
$(BUILDDIR)/$(ZSTD_SRC_DIR)/source-extracted: $(MSYS_NONEXISTENT_SYMLINK_TARGET_FIX)
6+
$(BUILDDIR)/$(ZSTD_SRC_DIR)/source-extracted: export MSYS=$(MSYS_NONEXISTENT_SYMLINK_TARGET_FIX)
77

88
ZSTD_BUILD_OPTS := MOREFLAGS="-DZSTD_MULTITHREAD $(fPIC)" bindir=$(build_private_libexecdir)
99
ifeq ($(OS), WINNT)

0 commit comments

Comments
 (0)