Permalink
Browse files

Revert "link libLLVM only to llvm_engine.so, not to libparrot"

This reverts commit b704d9e.
  • Loading branch information...
1 parent 4827ad8 commit 6a0476a1fa94ee53ab17a56931c12e6aa5f1ddb2 @bacek bacek committed with Reini Urban Mar 31, 2011
Showing with 3 additions and 5 deletions.
  1. +1 −1 config/auto/llvm.pm
  2. +1 −3 src/dynpmc/Defines.in
  3. +1 −1 src/dynpmc/Rules.in
View
@@ -73,7 +73,7 @@ sub runstep {
my $path = (split(' ',$2))[1];
$conf->data->set( llvm_shared => $path );
if ($lib =~ /lib(LLVM.*)\.(so|dll)/){
- $conf->data->set( llvm_ldflags => "-l$1" );
+ $conf->data->add( ' ', libs => "-l$1" );
}
else {
if ($verbose) {
View
@@ -12,7 +12,7 @@ DYNPMC_TARGETS = \
$(DYNEXT_DIR)/rotest$(LOAD_EXT) \
$(DYNEXT_DIR)/rational$(LOAD_EXT) \
$(DYNEXT_DIR)/subproxy$(LOAD_EXT) \
-#IF(has_llvm): $(DYNEXT_DIR)/llvm_engine$(LOAD_EXT)
+ $(DYNEXT_DIR)/llvm_engine$(LOAD_EXT)
DYNPMC_FOO = \
src/dynpmc/foo.pmc \
@@ -84,8 +84,6 @@ 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
@@ -259,7 +259,7 @@ src/dynpmc/select.dump: src/dynpmc/select.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) \
#IF(cygwin and optimize): -s \
- src/dynpmc/llvm_engine$(O) $(LINKARGS) $(LLVM_LDFLAGS)
+ src/dynpmc/llvm_engine$(O) $(LINKARGS)
#IF(win32): if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
#IF(cygwin or hpux): $(CHMOD) 0775 $@

0 comments on commit 6a0476a

Please sign in to comment.