Commit fc5ffd32e9

@@ -11,30 +11,24 @@ find_path(LLVM_C_INCLUDE_DIR NAMES llvm-c/Core.h PATHS /usr/include/llvm-c-3.7/)
 find_path(LLVM_INCLUDE_DIR NAMES llvm/IR/IRBuilder.h PATHS /usr/include/llvm-3.7/)
 set(LLVM_INCLUDE_DIRS ${LLVM_C_INCLUDE_DIR} ${LLVM_INCLUDE_DIR})
 
-find_library(LLVM_LIBRARY NAMES LLVM)
-if(LLVM_LIBRARY)
-    set(LLVM_LIBRARIES ${LLVM_LIBRARY})
-    set(LLVM_LIBDIRS "")
-else()
-    find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)
-
-    execute_process(
-        COMMAND ${LLVM_CONFIG_EXE} --libs
-        OUTPUT_VARIABLE LLVM_LIBRARIES
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    execute_process(
-        COMMAND ${LLVM_CONFIG_EXE} --system-libs
-        OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    execute_process(
-        COMMAND ${LLVM_CONFIG_EXE} --libdir
-        OUTPUT_VARIABLE LLVM_LIBDIRS
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
-endif()
+find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)
+
+execute_process(
+    COMMAND ${LLVM_CONFIG_EXE} --libs
+    OUTPUT_VARIABLE LLVM_LIBRARIES
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(
+    COMMAND ${LLVM_CONFIG_EXE} --system-libs
+    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(
+    COMMAND ${LLVM_CONFIG_EXE} --libdir
+    OUTPUT_VARIABLE LLVM_LIBDIRS
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
 
 
 include(FindPackageHandleStandardArgs)

@@ -152,8 +152,8 @@ add_executable(zig ${ZIG_SOURCES})
 set_target_properties(zig PROPERTIES
     COMPILE_FLAGS ${EXE_CFLAGS})
 target_link_libraries(zig LINK_PUBLIC
-    ${LLVM_LIBRARIES}
     ${CLANG_LIBRARIES}
+    ${LLVM_LIBRARIES}
 )
 install(TARGETS zig DESTINATION bin)