mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 06:03:40 +00:00
006d8dcdc1
This required moving to the cmake build for llvm in order to build clang separately from llvm. svn path=/nixpkgs/trunk/; revision=30956
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
|
|
--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500
|
|
+++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 05:32:38.695513475 -0500
|
|
@@ -1800,6 +1800,7 @@
|
|
|
|
Linker = GetProgramPath("ld");
|
|
|
|
+#if 0
|
|
LinuxDistro Distro = DetectLinuxDistro(Arch);
|
|
|
|
if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
|
|
@@ -1882,6 +1883,7 @@
|
|
addPathIfExists(SysRoot + "/lib", Paths);
|
|
addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
|
|
addPathIfExists(SysRoot + "/usr/lib", Paths);
|
|
+#endif
|
|
}
|
|
|
|
bool Linux::HasNativeLLVMSupport() const {
|
|
diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp
|
|
--- clang-3.0.src-orig/lib/Driver/Tools.cpp 2011-11-07 05:27:39.000000000 -0500
|
|
+++ clang-3.0.src/lib/Driver/Tools.cpp 2011-12-19 05:34:44.075325534 -0500
|
|
@@ -4306,6 +4306,7 @@
|
|
ToolChain.getArch() == llvm::Triple::thumb ||
|
|
(!Args.hasArg(options::OPT_static) &&
|
|
!Args.hasArg(options::OPT_shared))) {
|
|
+#if 0
|
|
CmdArgs.push_back("-dynamic-linker");
|
|
if (ToolChain.getArch() == llvm::Triple::x86)
|
|
CmdArgs.push_back("/lib/ld-linux.so.2");
|
|
@@ -4318,6 +4319,7 @@
|
|
CmdArgs.push_back("/lib64/ld64.so.1");
|
|
else
|
|
CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
|
|
+#endif
|
|
}
|
|
|
|
CmdArgs.push_back("-o");
|