Changeset 5f176da 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:
bc48242
Parents:
41408d94
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-26 20:32:16)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

Pull *ARCH from config

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r41408d94 r5f176da  
    6363CROSS_PATH = $(shell dirname "$(CC)")
    6464
     65CROSS_TARGET ?= $(UARCH)
     66
    6567ifeq ($(MACHINE),bmalta)
    66         UARCH = mips32eb
     68        CROSS_TARGET = mips32eb
    6769endif
    6870
    … …  
    7375
    7476$(BUILD_DIR)/build.ninja: Makefile.config version
    75         PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(UARCH) $(MESON_ARGS)
     77        PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
    7678
    7779common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
Note: See TracChangeset for help on using the changeset viewer.