diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-04-08 02:14:37 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-04-08 02:14:37 +0000 |
| commit | 06a801a38c43716564b3b9fb6c7a04ed242ecb61 (patch) | |
| tree | e3a41ccf1fd14ef53814ddcfb7618f62266c046a /Makefile | |
| parent | 8dfb3e536664bed175642bbd88c64936d6c9a723 (diff) | |
| download | llvm-06a801a38c43716564b3b9fb6c7a04ed242ecb61.tar.gz llvm-06a801a38c43716564b3b9fb6c7a04ed242ecb61.tar.bz2 llvm-06a801a38c43716564b3b9fb6c7a04ed242ecb61.tar.xz | |
Fix recursion:
1. Make setting OPTIONAL_DIRS use immediate assignment
2. Include Makefile.config before ifeq tests and then Makefile.rules later
instead of Makefile.common up front. This ensures that the variable
values are set before the ifeq statements in Makefile.rules are
evaluated.
With this, recursion into projects/examples is corrected.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27519 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -9,7 +9,7 @@ LEVEL = . DIRS = lib/System lib/Support utils lib -include $(LEVEL)/Makefile.common +include $(LEVEL)/Makefile.config ifeq ($(MAKECMDGOALS),tools-only) DIRS += tools @@ -21,12 +21,14 @@ else else $(warning Skipping runtime libraries, llvm-gcc 4 detected.) endif + OPTIONAL_DIRS := examples projects DIRS += docs - OPTIONAL_DIRS = examples projects endif endif EXTRA_DIST := test llvm.spec include +include $(LLVM_SRC_ROOT)/Makefile.rules + # Specify options to pass to configure script when we're # running the dist-check target DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR) |