5912acb67
Eric Andersen
2003-11-05
Subject
By popular demand, revert to version 1.21, since Rules.mak:1.22 causes the build to ignore CROSS_COMPILER_PREFIX set in .config
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Rules.mak+13 -11
| @@ -34,23 +34,23 @@ BUILDTIME := $(shell TZ=UTC date -u "+%Y.%m.%d-%H:%M%z") | |
| # to something more interesting... Target architecture is determined | |
| # by asking the CC compiler what arch it compiles things for, so unless | |
| # your compiler is broken, you should not need to specify TARGET_ARCH | |
| - | CROSS ?=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) |
| + | CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) |
| #CROSS =/usr/i386-linux-uclibc/bin/i386-uclibc- | |
| - | CC ?= $(CROSS)gcc |
| - | AR ?= $(CROSS)ar |
| - | AS ?= $(CROSS)as |
| - | LD ?= $(CROSS)ld |
| - | NM ?= $(CROSS)nm |
| - | STRIP ?= $(CROSS)strip |
| - | CPP ?= $(CC) -E |
| + | CC = $(CROSS)gcc |
| + | AR = $(CROSS)ar |
| + | AS = $(CROSS)as |
| + | LD = $(CROSS)ld |
| + | NM = $(CROSS)nm |
| + | STRIP = $(CROSS)strip |
| + | CPP = $(CC) -E |
| MAKEFILES = $(TOPDIR).config | |
| # What OS are you compiling busybox for? This allows you to include | |
| # OS specific things, syscall overrides, etc. | |
| - | TARGET_OS?=linux |
| + | TARGET_OS=linux |
| # Select the compiler needed to build binaries for your development system | |
| - | HOSTCC ?= gcc |
| + | HOSTCC = gcc |
| HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer | |
| # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. | |
| @@ -86,7 +86,8 @@ ARFLAGS=-r | |
| #-------------------------------------------------------- | |
| export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP | |
| - | TARGET_ARCH?=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ |
| + | ifeq ($(strip $(TARGET_ARCH)),) |
| + | TARGET_ARCH=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ |
| -e 's/i.86/i386/' \ | |
| -e 's/sparc.*/sparc/' \ | |
| -e 's/arm.*/arm/g' \ | |
| @@ -98,6 +99,7 @@ TARGET_ARCH?=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ | |
| -e 's/mipsel-.*/mipsel/' \ | |
| -e 's/cris.*/cris/' \ | |
| ) | |
| + | endif |
| # Pull in the user's busybox configuration | |
| ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) | |