125 lines
4.4 KiB
Plaintext
125 lines
4.4 KiB
Plaintext
From eeb679259a26c70e6b6ed1bf339a8f80a7064d91 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Wed, 20 Jan 2016 21:13:28 +0000
|
|
Subject: llvm-config: use /develop/headers instead of /include
|
|
|
|
* don't provide obj-root and src-root.
|
|
|
|
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|
|
index 7ef7c46..5282662 100644
|
|
--- a/tools/llvm-config/llvm-config.cpp
|
|
+++ b/tools/llvm-config/llvm-config.cpp
|
|
@@ -332,11 +332,16 @@ int main(int argc, char **argv) {
|
|
("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include");
|
|
} else {
|
|
ActivePrefix = CurrentExecPrefix;
|
|
+#ifdef __HAIKU__
|
|
+ ActiveIncludeDir = ActivePrefix + "/develop/headers";
|
|
+ ActiveLibDir = ActivePrefix + "/develop/lib" + LLVM_LIBDIR_SUFFIX;
|
|
+#else
|
|
ActiveIncludeDir = ActivePrefix + "/include";
|
|
+ ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
|
|
+#endif
|
|
SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR));
|
|
sys::fs::make_absolute(ActivePrefix, path);
|
|
ActiveBinDir = path.str();
|
|
- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
|
|
ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
|
|
ActiveIncludeOption = "-I" + ActiveIncludeDir;
|
|
}
|
|
@@ -556,10 +561,16 @@ int main(int argc, char **argv) {
|
|
OS << (LLVM_HAS_GLOBAL_ISEL ? "ON" : "OFF") << '\n';
|
|
} else if (Arg == "--shared-mode") {
|
|
PrintSharedMode = true;
|
|
- } else if (Arg == "--obj-root") {
|
|
- OS << ActivePrefix << '\n';
|
|
- } else if (Arg == "--src-root") {
|
|
- OS << LLVM_SRC_ROOT << '\n';
|
|
+ } else if (Arg == "--obj-root" || Arg == "--src-root") {
|
|
+ if (IsInDevelopmentTree) {
|
|
+ if (Arg == "--obj-root")
|
|
+ OS << ActivePrefix << '\n';
|
|
+ else
|
|
+ OS << LLVM_SRC_ROOT << '\n';
|
|
+ } else {
|
|
+ llvm::errs() << "llvm-config: sources not installed\n";
|
|
+ exit(1);
|
|
+ }
|
|
} else if (Arg == "--ignore-libllvm") {
|
|
LinkDyLib = false;
|
|
LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
|
|
--
|
|
2.21.0
|
|
|
|
|
|
From a77fe7f5be1df7c39c747d3b94268f1e52ddf366 Mon Sep 17 00:00:00 2001
|
|
From: Calvin Hill <calvin@hakobaito.co.uk>
|
|
Date: Sun, 9 Sep 2018 16:11:42 +0100
|
|
Subject: import header dir suffix patch from 3dEyes.
|
|
|
|
|
|
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|
|
index 5282662..084f26a 100644
|
|
--- a/tools/llvm-config/llvm-config.cpp
|
|
+++ b/tools/llvm-config/llvm-config.cpp
|
|
@@ -333,7 +333,7 @@ int main(int argc, char **argv) {
|
|
} else {
|
|
ActivePrefix = CurrentExecPrefix;
|
|
#ifdef __HAIKU__
|
|
- ActiveIncludeDir = ActivePrefix + "/develop/headers";
|
|
+ ActiveIncludeDir = ActivePrefix + "/develop/headers" + LLVM_LIBDIR_SUFFIX;
|
|
ActiveLibDir = ActivePrefix + "/develop/lib" + LLVM_LIBDIR_SUFFIX;
|
|
#else
|
|
ActiveIncludeDir = ActivePrefix + "/include";
|
|
--
|
|
2.21.0
|
|
|
|
|
|
From f9e2b45dd73d075d2388277927cf35089f00422d Mon Sep 17 00:00:00 2001
|
|
From: Calvin Hill <calvin@hakobaito.co.uk>
|
|
Date: Sun, 9 Sep 2018 16:17:33 +0100
|
|
Subject: llvm: allow llvm gtests to build on Haiku.
|
|
|
|
|
|
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h
|
|
index d36e820..e6dbb2d 100644
|
|
--- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h
|
|
+++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h
|
|
@@ -793,7 +793,8 @@ using ::std::tuple_size;
|
|
(GTEST_OS_MAC && !GTEST_OS_IOS) || \
|
|
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
|
|
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
|
|
- GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NETBSD)
|
|
+ GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NETBSD \
|
|
+ || GTEST_OS_HAIKU)
|
|
# define GTEST_HAS_DEATH_TEST 1
|
|
#endif
|
|
|
|
--
|
|
2.21.0
|
|
|
|
|
|
From 3306d07574b3e627d3854a060cea2c74cc6f25dc Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 12 Mar 2019 21:01:42 +0100
|
|
Subject: llvm: sysexits.h requires _BSD_SOURCE on Haiku beta1.
|
|
|
|
|
|
diff --git a/lib/Support/Unix/Signals.inc b/lib/Support/Unix/Signals.inc
|
|
index 634c16a..4ab46b9 100644
|
|
--- a/lib/Support/Unix/Signals.inc
|
|
+++ b/lib/Support/Unix/Signals.inc
|
|
@@ -47,6 +47,9 @@
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <algorithm>
|
|
#include <string>
|
|
+#ifdef __HAIKU__
|
|
+#define _BSD_SOURCE
|
|
+#endif
|
|
#include <sysexits.h>
|
|
#ifdef HAVE_BACKTRACE
|
|
# include BACKTRACE_HEADER // For backtrace().
|
|
--
|
|
2.21.0
|
|
|