Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[deps/llvm] don't use hardcode LLVM_SHARED_LIB_NAME #45908

Merged
merged 3 commits into from
Jul 5, 2022
Merged

[deps/llvm] don't use hardcode LLVM_SHARED_LIB_NAME #45908

merged 3 commits into from
Jul 5, 2022

Conversation

inkydragon
Copy link
Member

This pr will replace #44260
$(LLVM_CONFIG_HOST) --libs --link-shared is still broken on Windows.

Related updtream issues: llvm/llvm-project#55544, llvm/llvm-project#39599

@inkydragon inkydragon added building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries labels Jul 3, 2022
This was referenced Jul 3, 2022
Draft
Closed
vchuravy
vchuravy reviewed Jul 3, 2022
View reviewed changes
src/Makefile Show resolved Hide resolved
@vchuravy
Copy link
Member

vchuravy commented Jul 3, 2022

Thank you for picking this up!

@vchuravy vchuravy merged commit eb72c2a into JuliaLang:master Jul 5, 2022
@inkydragon inkydragon deleted the llvm_ver branch July 5, 2022 12:13
vtjnash
vtjnash reviewed Jul 5, 2022
View reviewed changes
Makefile
Comment on lines +3 to +4
# import LLVM_SHARED_LIB_NAME
include $(JULIAHOME)/deps/llvm-ver.make
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should not depend on deps/llvm-ver.make, since the correct value is given by llvm-config-host --version, while llvm-ver.make might not have version info (either outdated, wrong, or not available from git)

Copy link
Member Author

@inkydragon inkydragon Jul 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vtjnash But We do not call llvm-config-host here.

We only need LLVM_SHARED_LIB_NAME in main Makefile.

LLVM_SHARED_LIB_NAME <- LLVM_SHARED_LIB_VER_SUFFIX <- LLVM_VER_MAJ <- LLVM_VER

The original shared library name is a fixed string. It needs to be updated manually.
So my patch is mainly to keep the version in the lib name in sync with LLVM_VER.

If necessary I can also create a new variable and call llvm-config-host to get the correct parameters.

ffucci pushed a commit to ffucci/julia that referenced this pull request Aug 11, 2022
@inkydragon
[deps/llvm] don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang#45908)
8d73cb8
pcjentsch pushed a commit to pcjentsch/julia that referenced this pull request Aug 18, 2022
@inkydragon @pcjentsch
[deps/llvm] don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang#45908)
c7ff85e
stahta01 added a commit to stahta01/julia that referenced this pull request Feb 2, 2023
@stahta01
Backport part of don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang…
d803b81 
…#45908)
stahta01 added a commit to stahta01/julia that referenced this pull request Feb 2, 2023
@stahta01
Backport most of don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang…
9ebb550 
…#45908)
stahta01 added a commit to stahta01/julia that referenced this pull request Feb 2, 2023
@stahta01
Backport most of don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang…
e83ef0a 
…#45908)
stahta01 added a commit to stahta01/julia that referenced this pull request Feb 2, 2023
@stahta01
Backport most of don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang…
6d19742 
…#45908)
stahta01 pushed a commit to stahta01/julia that referenced this pull request Feb 5, 2023
@inkydragon @stahta01
[deps/llvm] don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang#45908)
5aceb12 
(cherry picked from commit eb72c2a)
stahta01 pushed a commit to stahta01/julia that referenced this pull request Feb 6, 2023
@inkydragon @stahta01
don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang#45908)
47b9b9d 
(cherry picked from commit eb72c2a)
stahta01 pushed a commit to stahta01/julia that referenced this pull request Feb 6, 2023
@inkydragon @stahta01
don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang#45908)
53225ec 
Hand edited changes to deps/llvm.version and deps/Versions.make
Moved LLVM_VER from Versions.make to llvm.version by Tim S.

(cherry picked from commit eb72c2a)
stahta01 pushed a commit to stahta01/julia that referenced this pull request Feb 6, 2023
@inkydragon @stahta01
don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang#45908)
155c82d 
Hand edited changes to deps/llvm.version and deps/Versions.make
Moved LLVM_VER from Versions.make to llvm.version by Tim S.

(cherry picked from commit eb72c2a)
stahta01 pushed a commit to stahta01/julia that referenced this pull request Feb 7, 2023
@inkydragon @stahta01
don't use hardcode LLVM_SHARED_LIB_NAME (JuliaLang#45908)
bc64b22 
Hand edited changes to deps/llvm.version and deps/Versions.make
Moved LLVM_VER from Versions.make to llvm.version by Tim S.

(cherry picked from commit eb72c2a)
KristofferC pushed a commit that referenced this pull request Feb 13, 2023
@stahta01 @inkydragon
don't use hardcode LLVM_SHARED_LIB_NAME (#45908) (#48560)
1cdf6bf 
Hand edited changes to deps/llvm.version and deps/Versions.make
Moved LLVM_VER from Versions.make to llvm.version by Tim S.

(cherry picked from commit eb72c2a)

Co-authored-by: woclass <git@wo-class.cn>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vtjnash vtjnash vtjnash left review comments

@vchuravy vchuravy vchuravy left review comments

@staticfloat staticfloat staticfloat approved these changes

Assignees
No one assigned
Labels
building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@inkydragon @vchuravy @staticfloat @vtjnash