gnu: clang: Allow 'clang' to link executables.
* gnu/packages/patches/clang-libc-search-path.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/llvm.scm (clang-from-llvm)[source]: Use it. [inputs]: Add "gcc-lib". [arguments]. Add -DGCC_INSTALL_PREFIX and -DC_INCLUDE_DIRS to #:configure-flags. Add #:phases argument.
This commit is contained in:
parent
ef11ac8701
commit
fd6ae1b983
@ -394,6 +394,7 @@ dist_patch_DATA = \
|
|||||||
gnu/packages/patches/calibre-no-updates-dialog.patch \
|
gnu/packages/patches/calibre-no-updates-dialog.patch \
|
||||||
gnu/packages/patches/cdparanoia-fpic.patch \
|
gnu/packages/patches/cdparanoia-fpic.patch \
|
||||||
gnu/packages/patches/chmlib-inttypes.patch \
|
gnu/packages/patches/chmlib-inttypes.patch \
|
||||||
|
gnu/packages/patches/clang-libc-search-path.patch \
|
||||||
gnu/packages/patches/clucene-pkgconfig.patch \
|
gnu/packages/patches/clucene-pkgconfig.patch \
|
||||||
gnu/packages/patches/cmake-fix-tests.patch \
|
gnu/packages/patches/cmake-fix-tests.patch \
|
||||||
gnu/packages/patches/coreutils-dummy-man.patch \
|
gnu/packages/patches/coreutils-dummy-man.patch \
|
||||||
|
@ -26,6 +26,8 @@
|
|||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (gnu packages gcc)
|
||||||
|
#:use-module (gnu packages bootstrap) ;glibc-dynamic-linker
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages xml))
|
#:use-module (gnu packages xml))
|
||||||
@ -85,7 +87,8 @@ tools as well as libraries with equivalent functionality.")
|
|||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "http://llvm.org/releases/"
|
(uri (string-append "http://llvm.org/releases/"
|
||||||
version "/cfe-" version ".src.tar.xz"))
|
version "/cfe-" version ".src.tar.xz"))
|
||||||
(sha256 (base32 hash))))
|
(sha256 (base32 hash))
|
||||||
|
(patches (list (search-patch "clang-libc-search-path.patch")))))
|
||||||
;; Using cmake allows us to treat llvm as an external library. There
|
;; Using cmake allows us to treat llvm as an external library. There
|
||||||
;; doesn't seem to be any way to do this with clang's autotools-based
|
;; doesn't seem to be any way to do this with clang's autotools-based
|
||||||
;; build system.
|
;; build system.
|
||||||
@ -93,10 +96,40 @@ tools as well as libraries with equivalent functionality.")
|
|||||||
(native-inputs (package-native-inputs llvm))
|
(native-inputs (package-native-inputs llvm))
|
||||||
(inputs
|
(inputs
|
||||||
`(("libxml2" ,libxml2)
|
`(("libxml2" ,libxml2)
|
||||||
|
("gcc-lib" ,gcc-4.9 "lib")
|
||||||
,@(package-inputs llvm)))
|
,@(package-inputs llvm)))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("llvm" ,llvm)))
|
`(("llvm" ,llvm)))
|
||||||
(arguments `(#:configure-flags '("-DCLANG_INCLUDE_TESTS=True")))
|
(arguments
|
||||||
|
`(#:configure-flags
|
||||||
|
(list "-DCLANG_INCLUDE_TESTS=True"
|
||||||
|
|
||||||
|
;; Find libgcc_s, crtbegin.o, and crtend.o.
|
||||||
|
(string-append "-DGCC_INSTALL_PREFIX="
|
||||||
|
(assoc-ref %build-inputs "gcc-lib"))
|
||||||
|
|
||||||
|
;; Use a sane default include directory.
|
||||||
|
(string-append "-DC_INCLUDE_DIRS="
|
||||||
|
(assoc-ref %build-inputs "libc")
|
||||||
|
"/include"))
|
||||||
|
|
||||||
|
#:phases (modify-phases %standard-phases
|
||||||
|
(add-after
|
||||||
|
'unpack 'set-glibc-file-names
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(let ((libc (assoc-ref inputs "libc")))
|
||||||
|
;; Patch the 'getLinuxDynamicLinker' function to that
|
||||||
|
;; it uses the right dynamic linker file name.
|
||||||
|
(substitute* "lib/Driver/Tools.cpp"
|
||||||
|
(("/lib64/ld-linux-x86-64.so.2")
|
||||||
|
(string-append libc
|
||||||
|
,(glibc-dynamic-linker))))
|
||||||
|
|
||||||
|
;; Same for libc's libdir, to allow crt1.o & co. to be
|
||||||
|
;; found.
|
||||||
|
(substitute* "lib/Driver/ToolChains.cpp"
|
||||||
|
(("@GLIBC_LIBDIR@")
|
||||||
|
(string-append libc "/lib")))))))))
|
||||||
|
|
||||||
;; Clang supports the same environment variables as GCC.
|
;; Clang supports the same environment variables as GCC.
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
|
19
gnu/packages/patches/clang-libc-search-path.patch
Normal file
19
gnu/packages/patches/clang-libc-search-path.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
Clang attempts to guess file names based on the OS and distro (yes!),
|
||||||
|
but unfortunately, that doesn't work for us.
|
||||||
|
|
||||||
|
This patch makes it easy to insert libc's $libdir so that Clang passes the
|
||||||
|
correct absolute file name of crt1.o etc. to 'ld'.
|
||||||
|
|
||||||
|
--- cfe-3.6.0.src/lib/Driver/ToolChains.cpp 2015-02-18 22:03:07.000000000 +0100
|
||||||
|
+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp 2015-06-19 16:37:20.459701044 +0200
|
||||||
|
@@ -3085,6 +3085,10 @@ Linux::Linux(const Driver &D, const llvm
|
||||||
|
|
||||||
|
addPathIfExists(SysRoot + "/lib", Paths);
|
||||||
|
addPathIfExists(SysRoot + "/usr/lib", Paths);
|
||||||
|
+
|
||||||
|
+ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o,
|
||||||
|
+ // and friends can be found.
|
||||||
|
+ addPathIfExists("@GLIBC_LIBDIR@", Paths);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Linux::HasNativeLLVMSupport() const {
|
Loading…
Reference in New Issue
Block a user