[llvm-config-removal] Instead of maintaining our own LLVM_LIBRARY_DIR… #3133
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci Please test |
gottesmm
changed the title
gottesmm
force-pushed
the
use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir
branch
from
76e0441 to
efae3ba
Compare
|
@swift-ci Please test |
gottesmm
force-pushed
the
use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir
branch
from
efae3ba to
ec228c7
Compare
|
@swift-ci Please smoke test |
|
The first commit is actually in #3134. I am just trying to make forward progress. |
gottesmm
force-pushed
the
use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir
branch
from
ec228c7 to
7e53ab9
Compare
|
I decided to just hit all 3 variables |
|
@swift-ci Please test |
|
@gribozavr What do you think? |
gottesmm
force-pushed
the
use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir
branch
2 times, most recently
from
7122da9 to
5c1bbf0
Compare
|
@swift-ci Please smoke test |
gottesmm
force-pushed
the
use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir
branch
from
5c1bbf0 to
838bf0d
Compare
|
@swift-ci Please smoke test |
|
|
||
| function(precondition var) | ||
| if (NOT ${var}) | ||
| message(FATAL_ERROR "Error! Variable ${var} is not set!") |
There was a problem hiding this comment.
It can actually be set to false, 0 or any other string that CMake treats as false.
gottesmm
changed the title
|
The linux failure looks unrelated. I am going to fix the things that Dmitri suggested and then merge. |
… such as precondition.
…lues instead of re-setting it later ot the same value.
Before this patch, we would always set ${product}_PATH_TO_LLVM_{SOURCE,BUILD} to
a value taken from llvm-config. But, turns out we had generated llvm-config
using these values. Thus llvm-config is just giving us back values we already
have.
This commit changes these variables to be precondition variables and doesn't
cause them to be reset.
rdar://26154980
…bles. Previously in order to support cross-compiling, we were setting these variables in build-script. Now that we are using LLVMConfig.cmake, passing in these values are no longer necessary. As an added benefit, Swift when not cross compiling, does not need to set these variables anyways. rdar://26154980
gottesmm
force-pushed
the
use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir
branch
from
838bf0d to
e24e1f7
Compare
|
Made the changes, merging. |
gottesmm
deleted the
use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's in this pull request?
Resolved bug number: (SR-)
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.
…, use LLVM_BUILD_LIBRARY_DIR from LLVMConfig.cmake.
LLVM_LIBRARY_DIR is a variable that was added to enable build-script to find the
location of llvm's library dir even if
The reason why LLVM_LIBRARY_DIR variable was passed in from the command line
historically was b/c we did not use LLVMConfig.cmake and instead relied on
llvm-config. This meant when cross-compiling llvm, we could not get the llvm
build information via llvm-config.
LLVM_LIBRARY_DIR is meant to point to the the llvm library directory for the
LLVM that we just compiled. The only reason why it is set as an option when cross compiling is b/c a cross compiled
rdar://26154980