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.

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

set LLVM_VER from LLVM_CONFIG when using system LLVM #13241

Merged
merged 1 commit into from
Sep 21, 2015
Merged

Conversation

yuyichao
Copy link
Contributor

This was fixed in dbe934a but lost in #12463 . The release-0.4 branch is not affected.

@tkelman @vtjnash

@@ -646,6 +646,10 @@ LLVM_CONFIG := $(build_bindir)/llvm-config$(EXE)
endif
endif # LLVM_CONFIG undefined

ifeq ($(USE_SYSTEM_LLVM), 1)
LLVM_VER = $(shell $(LLVM_CONFIG) --version)
endif
Copy link
Contributor

Choose a reason for hiding this comment

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

move the JCPPFLAGS from a few lines higher up into this same block? also there's a comment a few lines lower endif # SYSTEM_LLVM that isn't accurate any more

@yuyichao
Copy link
Contributor Author

Updated

@@ -646,6 +642,11 @@ LLVM_CONFIG := $(build_bindir)/llvm-config$(EXE)
endif
endif # LLVM_CONFIG undefined

ifeq ($(USE_SYSTEM_LLVM), 1)
JCPPFLAGS+=-DSYSTEM_LLVM
LLVM_VER = $(shell $(LLVM_CONFIG) --version)
Copy link
Sponsor Member

Choose a reason for hiding this comment

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

:=

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@vtjnash
Copy link
Sponsor Member

vtjnash commented Sep 21, 2015

lgtm

yuyichao added a commit that referenced this pull request Sep 21, 2015
set LLVM_VER from LLVM_CONFIG when using system LLVM
@yuyichao yuyichao merged commit 47ed2ec into master Sep 21, 2015
@yuyichao yuyichao deleted the yyc/sys-llvm-ver branch September 21, 2015 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants