-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix LLVM link to include new zlib dependency #42524
Conversation
b6cc63b
to
35d9e7e
Compare
@@ -83,7 +83,7 @@ LLVM_CXXFLAGS += $(CXXFLAGS) | |||
LLVM_CPPFLAGS += $(CPPFLAGS) | |||
LLVM_LDFLAGS += $(LDFLAGS) | |||
LLVM_CMAKE += -DLLVM_TARGETS_TO_BUILD:STRING="$(LLVM_TARGETS)" -DCMAKE_BUILD_TYPE="$(LLVM_CMAKE_BUILDTYPE)" | |||
LLVM_CMAKE += -DLLVM_ENABLE_ZLIB=OFF -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_HOST_TRIPLE="$(or $(XC_HOST),$(BUILD_MACHINE))" | |||
LLVM_CMAKE += -DLLVM_ENABLE_ZLIB=ON -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_HOST_TRIPLE="$(or $(XC_HOST),$(BUILD_MACHINE))" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs something like: LLVM_CMAKE += -DZLIB_DIR="$(build_prefix)"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At this point it looks like we should just fix the default build first, and figure this out after.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think our shiny new nightly-testing builds are hitting the lack of something like LLVM_CMAKE += -DZLIB_DIR="$(build_prefix)"
that Valentin identifies:
../../../bin/llvm-tblgen: error while loading shared libraries: libz.so.1: cannot open shared object file: No such file or directory
make[4]: *** [include/llvm/IR/CMakeFiles/intrinsics_gen.dir/build.make:155: include/llvm/IR/Attributes.inc] Error 127
make[3]: *** [CMakeFiles/Makefile2:8973: include/llvm/IR/CMakeFiles/intrinsics_gen.dir/all] Error 2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have a link? I checked locally today and found it not necessary.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regrets, I meant RAI's shiny new nightly-testing builds, so no link. I can share more via other channels or a call though :).
35d9e7e
to
78c8f0f
Compare
It looks like it got passed the problem areas, though buildkite is very angry right now at other reasons. Though possibly one seems relevant to you Jeff (musl):
|
(cherry picked from commit 2f00fe1)
(cherry picked from commit 2f00fe1)
(cherry picked from commit 2f00fe1)
(cherry picked from commit 2f00fe1)
@@ -283,7 +283,7 @@ $(eval $(call LLVM_PATCH,llvm7-symver-jlprefix)) | |||
endif | |||
|
|||
# declare that all patches must be applied before running ./configure | |||
$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV) | |||
$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV) $(build_prefix)/manifest/zlib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This addition broke USE_SYSTEM_ZLIB=1
: now the build always tries to download the zlib sources (and fails if network is unavailable).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should have been #44584 (comment)?
No description provided.