Look for llvm-ld in llvm-config --bindir

nickg · Dec 28, 2011 · 091bd35 · 091bd35
1 parent 1f0b448
commit 091bd35
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/config.h.in b/config.h.in
@@ -155,6 +155,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
+/* Location of LLVM binaries */
+#undef LLVM_CONFIG_BINDIR
+
 /* Version of LLVM installed */
 #undef LLVM_VERSION
 

diff --git a/m4/ax_llvm_c.m4 b/m4/ax_llvm_c.m4
@@ -58,7 +58,8 @@ AC_ARG_WITH([llvm],
 			LLVM_CXXFLAGS=`$ac_llvm_config_path --cxxflags`
 			LLVM_LDFLAGS="$($ac_llvm_config_path --ldflags)"
                         LLVM_LIBS="$($ac_llvm_config_path --libs $1)"
-                        LLVM_VERSION="$(llvm-config --version | sed s/\\.// | sed s/svn//g)"
+                        LLVM_VERSION="$($ac_llvm_config_path --version | sed s/\\.// | sed s/svn//g)"
+                        LLVM_CONFIG_BINDIR="$($ac_llvm_config_path --bindir)"
 
 			AC_REQUIRE([AC_PROG_CXX])
 
@@ -109,5 +110,6 @@ AC_ARG_WITH([llvm],
                         AC_SUBST(LLVM_LIBS)
 			AC_DEFINE(HAVE_LLVM,,[Defined if LLVM is available])
                         AC_DEFINE_UNQUOTED(LLVM_VERSION,[$LLVM_VERSION],[Version of LLVM installed])
+                        AC_DEFINE_UNQUOTED(LLVM_CONFIG_BINDIR,["$LLVM_CONFIG_BINDIR"],[Location of LLVM binaries])
 		fi
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,9 +10,9 @@ AM_LDFLAGS = -rdynamic $(LLVM_LDFLAGS)
 BUILT_SOURCES = parse.h
 
 libnvc_a_SOURCES = lib.c util.c ident.c parse.y lexer.l tree.c type.c \
-	sem.c elab.c simp.c driver.c dump.c opt.c
+	sem.c elab.c simp.c driver.c dump.c opt.c link.c
 
-libcgen_a_SOURCES = cgen.c link.c
+libcgen_a_SOURCES = cgen.c
 libcgen_a_CFLAGS = $(AM_CFLAGS) $(LLVM_CFLAGS)
 
 nvc_SOURCES = nvc.c

diff --git a/src/link.c b/src/link.c
@@ -26,8 +26,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "llvm/Config/llvm-config.h"
-
 #define MAX_ARGS 64
 #define ARG_LEN  256
 
@@ -100,7 +98,7 @@ void link_bc(tree_t top)
 {
    args = xmalloc(MAX_ARGS * sizeof(char*));
 
-   link_arg_f("%s/llvm-ld", LLVM_BINDIR);
+   link_arg_f("%s/llvm-ld", LLVM_CONFIG_BINDIR);
    link_arg_f("-v");
    link_arg_f("-r");
    link_arg_f("-stats");