Skip to content

Commit 7a8d0e4

Browse files
authored
Fix order of MSYS rules (#58999)
git-external changes the LLVM_SRC_DIR variable, so the target-specific variable applies to the wrong target if defined before it - didn't notice in local testing because I had accidentally switched the variable globally earlier for testing - but showed up on a fresh build.
1 parent cecaf52 commit 7a8d0e4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

deps/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ include $(SRCDIR)/llvm-options.mk
66
ifneq ($(USE_BINARYBUILDER_LLVM), 1)
77
LLVM_GIT_URL:=https://github.com/JuliaLang/llvm-project.git
88
LLVM_TAR_URL=https://api.github.com/repos/JuliaLang/llvm-project/tarball/$1
9+
$(eval $(call git-external,llvm,LLVM,CMakeLists.txt,,$(SRCCACHE)))
910
# LLVM's tarball contains symlinks to non-existent targets. This breaks the
1011
# the default msys strategy `deepcopy` symlink strategy. To workaround this,
1112
# switch to `native` which tries native windows symlinks (possible if the
@@ -14,7 +15,6 @@ LLVM_TAR_URL=https://api.github.com/repos/JuliaLang/llvm-project/tarball/$1
1415
# to succeed. We could guard this by a uname check, but it's harmless elsewhere,
1516
# so let's not incur the additional overhead.
1617
$(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted: export MSYS=winsymlinks:native
17-
$(eval $(call git-external,llvm,LLVM,CMakeLists.txt,,$(SRCCACHE)))
1818

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

0 commit comments

Comments
 (0)