llvm.org GIT mirror llvm / 38d439f
test: Use $SharedLibDir for loadable modules. On Cygming, loadable modules are not in lib/ but bin. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120274 91177308-0d34-0410-b5e6-96231b3b80d8 NAKAMURA Takumi 8 years ago
6 changed file(s) with 9 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
55 # FIXME: This won't work for project files, we need to use a --param.
66 set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}")
77 set(SHLIBEXT "${LTDL_SHLIB_EXT}")
8
9 set(SHLIBDIR "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}")
810
911 if(BUILD_SHARED_LIBS)
1012 set(LLVM_SHARED_LIBS_ENABLED "1")
142142 @echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp
143143 @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
144144 @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
145 @echo 'set llvmshlibdir "$(SharedLibDir)"' >>site.tmp
145146 @echo 'set llvm_bindings "$(BINDINGS_TO_BUILD)"' >> site.tmp
146147 @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
147148 @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
186187 -e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
187188 -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
188189 -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
190 -e "s#@SHLIBDIR@#$(SharedLibDir)#g" \
189191 -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \
190192 $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
191193
2424
2525 # If necessary, point the dynamic loader at libLLVM.so.
2626 if config.enable_shared:
27 libdir = os.path.join(config.llvm_obj_root, config.llvm_build_mode, 'lib')
2827 shlibpath = config.environment.get(config.shlibpath_var,'')
2928 if shlibpath:
30 shlibpath = ':' + shlibpath
31 shlibpath = libdir + shlibpath
29 shlibpath = os.pathsep + shlibpath
30 shlibpath = config.shlibdir + shlibpath
3231 config.environment[config.shlibpath_var] = shlibpath
3332
3433 # Check that the object root is known.
55 config.llvmgcc_dir = "@LLVMGCCDIR@"
66 config.llvm_build_mode = "@LLVM_BUILD_MODE@"
77 config.enable_shared = @ENABLE_SHARED@
8 config.shlibdir = "@SHLIBDIR@"
89 config.shlibpath_var = "@SHLIBPATH_VAR@"
910
1011 # Support substitution of the tools_dir and build_mode with user parameters.
127127 config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc']))
128128 for sub in ['llvmgcc', 'llvmgxx', 'emitir', 'compile_cxx', 'compile_c',
129129 'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',
130 'llvmshlibdir',
130131 'bugpoint_topts']:
131132 if sub in ('llvmgcc', 'llvmgxx'):
132133 config.substitutions.append(('%' + sub,
44 set llvmgcc_langs "@LLVMGCC_LANGS@"
55 set llvmtoolsdir "@LLVM_TOOLS_DIR@"
66 set llvmlibsdir "@LLVM_LIBS_DIR@"
7 set llvmshlibdir "@SHLIBDIR@"
78 set llvm_bindings "@LLVM_BINDINGS@"
89 set srcroot "@LLVM_SOURCE_DIR@"
910 set objroot "@LLVM_BINARY_DIR@"