mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 12:41:49 +01:00
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. llvm-svn: 27519
This commit is contained in:
parent
96d179528e
commit
2bab033f26
6
Makefile
6
Makefile
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user