diff options
| author | Lauri Leukkunen <lle@rahina.org> | 2006-09-03 15:06:24 +0300 |
|---|---|---|
| committer | Lauri Leukkunen <lleukkun@leka.rahina.org> | 2006-09-03 15:06:24 +0300 |
| commit | df37dd428afe81d03a9b69c2ac8f7af001ebba80 (patch) | |
| tree | 604afb7a1298f48789e21e1b174671936a4e4844 /llbuild | |
| parent | 76ab1f7eaa854ec65ecb2e58d1817da9b09fa53a (diff) | |
* llbuild update to fix some subdir/built-in.o substitution stuff
Diffstat (limited to 'llbuild')
| -rw-r--r-- | llbuild/Makefile.include | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llbuild/Makefile.include b/llbuild/Makefile.include index 60c60b4..4f42af7 100644 --- a/llbuild/Makefile.include +++ b/llbuild/Makefile.include @@ -58,14 +58,14 @@ LOCK ?= $(LLBUILD)/llflock $@.lock bin-%: _build_objects @run_sources="$($@)"; \ run_target="$(patsubst bin-%,%,$@)"; \ - run_cmd="$(CC) $(LDFLAGS) -o $(patsubst bin-%,%,$@) $($@) $(LIBS)"; \ + run_cmd="$(CC) $(LDFLAGS) -o $(patsubst bin-%,%,$@) $(shell for f in $($@) ; do if [ -d $$f ]; then echo $$f/built-in.o; else echo $$f; fi; done) $(LIBS)"; \ run_alias="BIN"; \ $(ll_pretty_run) cxxbin-%: _build_objects @run_sources="$($@)"; \ run_target="$(patsubst cxxbin-%,%,$@)"; \ - run_cmd="$(CXX) $(LDFLAGS) -o $(patsubst cxxbin-%,%,$@) $($@) $(LIBS)"; \ + run_cmd="$(CXX) $(LDFLAGS) -o $(patsubst cxxbin-%,%,$@) $(shell for f in $($@) ; do if [ -d $$f ]; then echo $$f/built-in.o; else echo $$f; fi; done) $(LIBS)"; \ run_alias="CXXBIN"; \ $(ll_pretty_run) |