Permalink
Browse files

link libLLVM only to llvm_engine.so, not to libparrot

  • Loading branch information...
1 parent 85144a2 commit b704d9e17d9ac71c26e17e51caf43167e3b62f73 Luben Karavelov committed Mar 25, 2011
Showing with 5 additions and 3 deletions.
  1. +1 −1 config/auto/llvm.pm
  2. +3 −1 src/dynpmc/Defines.in
  3. +1 −1 src/dynpmc/Rules.in
View
@@ -61,7 +61,7 @@ sub runstep {
my $lib = $1;
$conf->data->set( llvm_shared => $lib );
if ($lib =~ /lib(LLVM.*)\.(so|dll)/){
- $conf->data->add( ' ', libs => "-l$1" );
+ $conf->data->set( llvm_ldflags => "-l$1" );
}
}
View
@@ -10,7 +10,7 @@ DYNPMC_TARGETS = \
$(DYNEXT_DIR)/rotest$(LOAD_EXT) \
$(DYNEXT_DIR)/rational$(LOAD_EXT) \
$(DYNEXT_DIR)/subproxy$(LOAD_EXT) \
- $(DYNEXT_DIR)/llvm_engine$(LOAD_EXT)
+#IF(has_llvm): $(DYNEXT_DIR)/llvm_engine$(LOAD_EXT)
DYNPMC_FOO = \
src/dynpmc/foo.pmc \
@@ -90,6 +90,8 @@ DYNPMC_H_FILES = \
#ELSIF(win32):LIB_ZLIB = zlib.lib
#ELSE:LIB_ZLIB = -lz
+#IF(has_llvm):LLVM_LDFLAGS = @llvm_ldflags@
+
DYNPMC_CLEANUPS = \
$(DYNPMC_TARGETS) \
$(DYNPMC_FOO_OBJS) \
View
@@ -218,7 +218,7 @@ src/dynpmc/subproxy.dump: src/dynpmc/subproxy.pmc vtable.dump $(CLASS_O_FILES)
$(DYNEXT_DIR)/llvm_engine$(LOAD_EXT): src/dynpmc/llvm_engine$(O)
- $(LD) @ld_out@$(DYNEXT_DIR)/llvm_engine$(LOAD_EXT) src/dynpmc/llvm_engine$(O) $(LINKARGS) $(LINKFLAGS)
+ $(LD) @ld_out@$(DYNEXT_DIR)/llvm_engine$(LOAD_EXT) src/dynpmc/llvm_engine$(O) $(LINKARGS) $(LINKFLAGS) $(LLVM_LDFLAGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
#IF(cygwin or hpux): $(CHMOD) 0775 $@

0 comments on commit b704d9e

Please sign in to comment.