diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile | 1 | ||||
-rw-r--r-- | test/Unit/lit.cfg | 8 | ||||
-rw-r--r-- | test/Unit/lit.site.cfg.in | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/test/Makefile b/test/Makefile index e90370779c..dc99fe1a2f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -146,7 +146,6 @@ Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE @$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> unit.tmp @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> unit.tmp @$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> unit.tmp - @$(ECHOPATH) s=@SHLIBPATH_VAR@=$(SHLIBPATH_VAR)=g >> unit.tmp @$(ECHOPATH) s=@HOST_OS@=$(HOST_OS)=g >> unit.tmp @$(ECHOPATH) s=@HOST_ARCH@=$(HOST_ARCH)=g >> lit.tmp @sed -f unit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@ diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg index 68ba0b36c4..04e8830688 100644 --- a/test/Unit/lit.cfg +++ b/test/Unit/lit.cfg @@ -80,11 +80,3 @@ if config.test_exec_root is None: lit_config.note('using out-of-tree build at %r' % llvm_obj_root) lit_config.load_config(config, site_cfg) raise SystemExit - -# If necessary, point the dynamic loader at libLLVM.so. -if config.enable_shared: - shlibpath = config.environment.get(config.shlibpath_var,'') - if shlibpath: - shlibpath = os.pathsep + shlibpath - shlibpath = config.shlibdir + shlibpath - config.environment[config.shlibpath_var] = shlibpath diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in index 7ff8155dff..dd8de48951 100644 --- a/test/Unit/lit.site.cfg.in +++ b/test/Unit/lit.site.cfg.in @@ -8,7 +8,6 @@ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_build_mode = "@LLVM_BUILD_MODE@" config.enable_shared = @ENABLE_SHARED@ config.shlibdir = "@SHLIBDIR@" -config.shlibpath_var = "@SHLIBPATH_VAR@" # Support substitution of the tools_dir and build_mode with user parameters. # This is used when we can't determine the tool dir at configuration time. |