projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[RewriteStatepointsForGC] Yet more test cases for relocation
[oota-llvm.git]
/
unittests
/
Makefile.unittest
diff --git
a/unittests/Makefile.unittest
b/unittests/Makefile.unittest
index bf3179d3f292bcfa238a448ef3e6c370d5dd22db..a39edc675698dab5136069fe90499e562962e8e7 100644
(file)
--- a/
unittests/Makefile.unittest
+++ b/
unittests/Makefile.unittest
@@
-18,7
+18,7
@@
endif
# Clean up out-of-tree stray unittests for Lit not to pick one up.
.PHONY: cleanup-local
cleanup-local:
# Clean up out-of-tree stray unittests for Lit not to pick one up.
.PHONY: cleanup-local
cleanup-local:
- $(Verb) $(FIND) $(filter-out $(PARALLEL_DIRS), $(wildcard *)) -type f \
+
-
$(Verb) $(FIND) $(filter-out $(PARALLEL_DIRS), $(wildcard *)) -type f \
-path '*/$(BuildMode)/*Tests$(EXEEXT)' \
-exec rm -f '{}' \;
-path '*/$(BuildMode)/*Tests$(EXEEXT)' \
-exec rm -f '{}' \;
@@
-52,9
+52,6
@@
ifeq ($(ENABLE_SHARED), 1)
# we'll never install unittests.
LD.Flags += $(RPATH) -Wl,$(SharedLibDir)
endif
# we'll never install unittests.
LD.Flags += $(RPATH) -Wl,$(SharedLibDir)
endif
- # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most
- # of the time.
- Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
endif
$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
endif
$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
@@
-67,6
+64,6
@@
$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
all:: $(LLVMUnitTestExe)
unitcheck:: $(LLVMUnitTestExe)
all:: $(LLVMUnitTestExe)
unitcheck:: $(LLVMUnitTestExe)
- $(
Run.Shared) $(
LLVMUnitTestExe)
+ $(LLVMUnitTestExe)
endif
endif