summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile14
-rw-r--r--RELEASE-NOTES4
2 files changed, 11 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 9da2964ddf..db8ecdacc6 100644
--- a/Makefile
+++ b/Makefile
@@ -109,13 +109,13 @@ INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
PWD = $(shell pwd)
-CROSS =
-CC = $(CROSS)gcc
-LD = $(CROSS)gcc
-AR = $(CROSS)ar
-RANLIB = $(CROSS)ranlib
+CROSS_COMPILE =
+CC = $(CROSS_COMPILE)gcc
+LD = $(CROSS_COMPILE)gcc
+AR = $(CROSS_COMPILE)ar
+RANLIB = $(CROSS_COMPILE)ranlib
HOSTCC = gcc
-STRIP = $(CROSS)strip
+STRIP = $(CROSS_COMPILE)strip
STRIPCMD = $(STRIP) -s
CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
@@ -145,7 +145,7 @@ ifeq ($(strip $(USE_GCOV)),true)
endif
ifeq ($(strip $(USE_KLIBC)),true)
- KLCC = /usr/bin/$(CROSS)klcc
+ KLCC = /usr/bin/$(CROSS_COMPILE)klcc
CC = $(KLCC)
LD = $(KLCC)
V = true
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cce8dc03ce..27545893c9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,7 @@
+udev 084
+========
+CROSS changed to CROSS_COMPILE to match the kernel build.
+
udev 083
========
Fix a bug where NAME="" would prevent RUN from beeing executed.