diff options
| author | Ron Olson <tachoknight@gmail.com> | 2019-02-09 01:19:25 -0600 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2019-02-09 01:19:25 -0600 |
| commit | f827ea60f5aa4736d54252805a73d8ef3f455ddb (patch) | |
| tree | 19f7f371b052bc9bc293160e98cf44f0c8e1b319 | |
| parent | 03d4ebee5b119ebd485fc4cf498894004ac6b3a9 (diff) | |
| download | swift-lang-f827ea60f5aa4736d54252805a73d8ef3f455ddb.tar.gz swift-lang-f827ea60f5aa4736d54252805a73d8ef3f455ddb.tar.xz swift-lang-f827ea60f5aa4736d54252805a73d8ef3f455ddb.zip | |
Added a patch to change location of clang libs
| -rw-r--r-- | clangloc.patch | 11 | ||||
| -rw-r--r-- | swift-lang.spec | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/clangloc.patch b/clangloc.patch new file mode 100644 index 0000000..5892519 --- /dev/null +++ b/clangloc.patch @@ -0,0 +1,11 @@ +--- lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp.orig 2019-02-08 20:24:10.121192411 -0600 ++++ lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp 2019-02-08 22:20:36.347687737 -0600 +@@ -34,7 +34,7 @@ + #else + static bool DefaultComputeClangDirectory(FileSpec &file_spec) { + return HostInfoPosix::ComputePathRelativeToLibrary( +- file_spec, "/lib/lldb/clang/"); ++ file_spec, "/swift/clang/"); + return HostInfoPosix::ComputePathRelativeToLibrary( + file_spec, (llvm::Twine("/lib") + CLANG_LIBDIR_SUFFIX + "/clang/" + + CLANG_VERSION_STRING) diff --git a/swift-lang.spec b/swift-lang.spec index a951cb7..f6e8564 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -29,6 +29,7 @@ Source14: swift-lang-runtime.conf Patch0: change-lldb-location.patch Patch1: no-ninja-build.patch Patch2: aarch64-new-master-VarArgs.patch +Patch3: clangloc.patch BuildRequires: clang BuildRequires: cmake @@ -114,6 +115,9 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo %patch2 -p0 %endif +# This changes the location of where the headers and libs are to keep lldb happy +%patch3 -p0 + %build export VERBOSE=1 |