diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | runtime/Makefile | 8 |
2 files changed, 19 insertions, 6 deletions
@@ -9,19 +9,24 @@ LEVEL = . DIRS = lib/System lib/Support utils lib +include $(LEVEL)/Makefile.common + ifeq ($(MAKECMDGOALS),tools-only) -DIRS += tools + DIRS += tools else ifneq ($(MAKECMDGOALS),libs-only) - DIRS += tools runtime docs - OPTIONAL_DIRS = examples projects + DIRS += tools + ifeq ($(LLVMGCC_MAJVERS),3) + DIRS += runtime + else + $(warning Skipping runtime libraries, llvm-gcc 4 detected.) + endif + DIRS += docs endif + OPTIONAL_DIRS = examples projects endif - EXTRA_DIST := test llvm.spec include -include $(LEVEL)/Makefile.common - # Specify options to pass to configure script when we're # running the dist-check target DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR) diff --git a/runtime/Makefile b/runtime/Makefile index a1c0152..1c474df 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -10,6 +10,13 @@ LEVEL = .. include $(LEVEL)/Makefile.config +ifneq ($(LLVMGCC_MAJVERS),3) +PARALLEL_DIRS := +install all:: + $(Echo) "Warning: The runtime libraries only need to be built with" + $(Echo) "Warning: llvm-gcc version 3. They are automatically included" + $(Echo) "Warning: with llvm-gcc version 4 and beyond" +else ifneq ($(wildcard $(LLVMGCC)),) PARALLEL_DIRS := GCCLibraries libdummy libprofile libtrace GC else @@ -26,6 +33,7 @@ endif ifeq ($(ARCH), Sparc) PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS)) endif +endif include $(LEVEL)/Makefile.common |