diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-16 06:14:27 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-16 06:18:54 -0600 |
| commit | 0ea8c014ef44695d0fd94f8738654e123e154cc0 (patch) | |
| tree | cba63bc66aea56290c24569477ee87185d017077 /xmerge | |
| parent | 9d76072055074cdd4bbd29ce6ba33c9499509fff (diff) | |
tweak gbuild standart Makefile to allow partial build in unsourced env
This allow to run make in a module wihtout the need to source
Env.Host.sh.
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmerge/Makefile b/xmerge/Makefile index 5bedaf0b9dcf..3080611e6c49 100644 --- a/xmerge/Makefile +++ b/xmerge/Makefile @@ -26,13 +26,13 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -$(error No environment set!) -endif +include ../solenv/gbuild/source_and_rerun.mk +else gb_PARTIALBUILD := T -GBUILDDIR := $(SOLARENV)/gbuild -include $(GBUILDDIR)/gbuild.mk +include $(SOLARENV)/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) +endif # vim: set noet sw=4 ts=4: |