Changeset e428bec in mainline for Makefile


Ignore:
Timestamp:
2019-08-17T12:49:43Z (5 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2c38a55b
Parents:
9810fc3
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-26 12:46:06)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

Allow changing build directory

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r9810fc3 re428bec  
    3939MESON = meson
    4040
     41BUILD_DIR=$(abspath build)
     42
    4143CONFIG_RULES = HelenOS.config
    4244
    … …  
    6466
    6567all: common export-cross test-xcw
    66         $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
     68        $(MAKE) -r -C boot PRECHECK=$(PRECHECK) BUILD_DIR=$(BUILD_DIR)
    6769
    68 build/build.ninja: Makefile.config version
    69         PATH="$(CROSS_PATH):$$PATH" meson . build --cross-file meson/cross/$(UARCH) $(MESON_ARGS)
     70$(BUILD_DIR)/build.ninja: Makefile.config version
     71        PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(UARCH) $(MESON_ARGS)
    7072
    71 common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) build/build.ninja
    72         PATH="$(CROSS_PATH):$$PATH" ninja -C build
    73         PATH="$(CROSS_PATH):$$PATH" DESTDIR="$$PWD/dist" meson install --no-rebuild --only-changed -C build > build/install.log
     73common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
     74        PATH="$(CROSS_PATH):$$PATH" ninja -C $(BUILD_DIR)
     75        PATH="$(CROSS_PATH):$$PATH" DESTDIR="$(BUILD_DIR)/dist" meson install --no-rebuild --only-changed -C $(BUILD_DIR) > $(BUILD_DIR)/install.log
    7476
    7577test-xcw: common export-cross
Note: See TracChangeset for help on using the changeset viewer.