Changeset d4b30cf in mainline for Makefile

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:

667c3fc

Parents:

2e2cefdb

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-30 11:49:55)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

Expect cross toolchain binaries to be in PATH

The cross files for Meson are written with this expectation, since
it allows us to not have to generate those files for custom user
paths. It's also convenient for general cross-building of code
to HelenOS (one can simply do CC=amd64-helenos-gcc to cross build
simple projects).

Previously, the Makefile set the PATH to preserve old user experience.
However that confusingly breaks when user tries to run ninja manually,
so we move the responsibility for PATH entirely to the user.

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -58 +58 @@
 endif
 
-CROSS_PREFIX ?= /usr/local/cross
-CROSS_PATH = $(CROSS_PREFIX)/bin
-
 CROSS_TARGET ?= $(UARCH)
 
@@ -72 +69 @@
 
 $(BUILD_DIR)/build.ninja: $(CONFIG_MAKEFILE) $(VERSION_FILE)
-        PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
+        meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
 
 meson: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
-        PATH="$(CROSS_PATH):$$PATH" ninja -C $(BUILD_DIR)
+        ninja -C $(BUILD_DIR)
 
 test-xcw: meson