authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-04-30 17:17:59-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-04-30 17:17:59-07:00
log037283c3b3e425193eebb766c17336ee55aa0384
tree6e7fb668bb7373ce512a87845d7d489ff2adddbc
parentd908afe1050caca4dd33333adcd4844738c10e56

build: link against libLLVM.so if available

readme: better instructions for finding native libc headers

2 files changed, 10 insertions(+), 4 deletions(-)

README.md+4-4
...@@ -75,14 +75,14 @@ compromises backward compatibility....@@ -75,14 +75,14 @@ compromises backward compatibility.
7575
76### Debug / Development Build76### Debug / Development Build
7777
78If you have gcc or clang installed, you can find out what `ZIG_LIBC_LIB_DIR`78If you have gcc or clang installed, you can find out what `ZIG_LIBC_LIB_DIR`,
79and `ZIG_LIBC_STATIC_LIB_DIR` should be set to (example below).79`ZIG_LIBC_STATIC_LIB_DIR`, and `ZIG_LIBC_INCLUDE_DIR` should be set to
80`ZIG_LIBC_INCLUDE_DIR` likely can be set to `/usr/include`.80(example below).
8181
82```82```
83mkdir build83mkdir build
84cd build84cd build
85cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $(cc -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=/usr/include -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o))85cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $(cc -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | cc -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2-) -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o))
86make86make
87make install87make install
88./run_tests88./run_tests
cmake/Findllvm.cmake+6
...@@ -29,6 +29,12 @@ execute_process(...@@ -29,6 +29,12 @@ execute_process(
29 OUTPUT_VARIABLE LLVM_INCLUDE_DIR29 OUTPUT_VARIABLE LLVM_INCLUDE_DIR
30 OUTPUT_STRIP_TRAILING_WHITESPACE)30 OUTPUT_STRIP_TRAILING_WHITESPACE)
3131
32find_library(LLVM_LIBRARY NAMES LLVM)
33
34if(LLVM_LIBRARY)
35 set(LLVM_LIBRARIES ${LLVM_LIBRARY})
36endif()
37
3238
33set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})39set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
3440