diff options
| author | Jack Lloyd <[email protected]> | 2018-10-07 18:07:48 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-10-07 18:07:48 -0400 |
| commit | b074cb4b554d2e932f4a5be48464f4b2716b3c2c (patch) | |
| tree | 5339f807c277b8501470c399804fc95dc007299e | |
| parent | f396fc92bab378440741174fdbb9144dccb0f90d (diff) | |
Fixes for building for LLVM bitcode/Emscripten
GH #1702
| -rw-r--r-- | src/build-data/cc/clang.txt | 2 | ||||
| -rw-r--r-- | src/build-data/os/llvm.txt | 5 | ||||
| -rw-r--r-- | src/tests/test_os_utils.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index 056cc8325..47ab837b5 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -68,7 +68,7 @@ llvm -> "-emit-llvm -fno-use-cxa-atexit" </cpu_flags> <mach_abi_linking> -all!haiku -> "-pthread" +all!haiku,llvm -> "-pthread" openmp -> "-fopenmp" diff --git a/src/build-data/os/llvm.txt b/src/build-data/os/llvm.txt index 132d7749f..87925142d 100644 --- a/src/build-data/os/llvm.txt +++ b/src/build-data/os/llvm.txt @@ -1,9 +1,14 @@ obj_suffix bc +static_suffix bc +program_suffix .bc + ar_command llvm-link ar_options -o +use_stack_protector no + <target_features> filesystem </target_features> diff --git a/src/tests/test_os_utils.cpp b/src/tests/test_os_utils.cpp index f198f8837..b441b34ae 100644 --- a/src/tests/test_os_utils.cpp +++ b/src/tests/test_os_utils.cpp @@ -56,7 +56,7 @@ class OS_Utils_Tests final : public Test result.test_eq("PID same across calls", static_cast<size_t>(pid1), static_cast<size_t>(pid2)); #if defined(BOTAN_TARGET_OS_IS_INCLUDEOS) || defined(BOTAN_TARGET_OS_IS_LLVM) - result.test_eq("PID is expected to be zero on this platform", pid1, 0); + result.test_eq("PID is expected to be zero on this platform", pid1, size_t(0)); #else result.test_ne("PID is non-zero on systems with processes", pid1, 0); #endif |