summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/config/Makefile17
-rw-r--r--extra/gcc-uClibc/Makefile2
-rw-r--r--extra/locale/Makefile10
3 files changed, 14 insertions, 15 deletions
diff --git a/extra/config/Makefile b/extra/config/Makefile
index e2fc8c5a7..50d9ac096 100644
--- a/extra/config/Makefile
+++ b/extra/config/Makefile
@@ -22,18 +22,17 @@ include $(TOPDIR)Rules.mak
all: ncurses conf mconf
-#NATIVE_CFLAGS=-Wall -g -O0
LIBS = -lncurses
ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
- NATIVE_CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
+ HOSTCFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
else
ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
- NATIVE_CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+ HOSTCFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
else
ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
- NATIVE_CFLAGS += -DCURSES_LOC="<ncurses.h>"
+ HOSTCFLAGS += -DCURSES_LOC="<ncurses.h>"
else
- NATIVE_CFLAGS += -DCURSES_LOC="<curses.h>"
+ HOSTCFLAGS += -DCURSES_LOC="<curses.h>"
endif
endif
endif
@@ -47,10 +46,10 @@ MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC))
LXDLG_OBJS=$(patsubst %.c,%.o, $(LXDLG_SRC))
conf: $(CONF_OBJS)
- $(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
+ $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
mconf: $(MCONF_OBJS) $(LXDLG_OBJS)
- $(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
+ $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
lkc_deps:=lkc.h lkc_proto.h lkc_defs.h expr.h zconf.tab.h
@@ -63,7 +62,7 @@ zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(lkc_dep
lex.zconf.o: lex.zconf.c $(lkc_deps)
%.o : %.c
- $(NATIVE_CC) $(NATIVE_CFLAGS) -I. -c $< -o $@
+ $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
lkc_defs.h: lkc_proto.h
@sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
@@ -97,7 +96,7 @@ endif
ncurses:
@echo "main() {}" > lxtemp.c
- @if $(NATIVE_CC) lxtemp.c $(LIBS) ; then \
+ @if $(HOSTCC) lxtemp.c $(LIBS) ; then \
rm -f lxtemp.c a.out; \
else \
rm -f lxtemp.c; \
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index 1c64f856a..523b10113 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -41,7 +41,7 @@ else
endif
gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
- $(NATIVE_CC) $(NATIVE_CFLAGS) -Wl,-s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
+ $(HOSTCC) $(HOSTCFLAGS) -Wl,-s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
ld-uClibc:
@echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
diff --git a/extra/locale/Makefile b/extra/locale/Makefile
index 3f6e7476e..deb60efb2 100644
--- a/extra/locale/Makefile
+++ b/extra/locale/Makefile
@@ -26,14 +26,14 @@ codesets.txt:
fi;
gen_wc8bit: gen_wc8bit.c
- $(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_wc8bit) $^ -o $@
+ $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_wc8bit) $^ -o $@
#gen_wc8bit.c -o gen_wc8bit
c8tables.h: gen_wc8bit codesets.txt
./gen_wc8bit `cat codesets.txt`
gen_wctype: gen_wctype.c
- $(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
+ $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $^ -o $@
#gen_wctype.c -o gen_wctype
# Warning! Beware tr_TR toupper/tolower exceptions!
@@ -42,7 +42,7 @@ wctables.h: gen_wctype
./gen_wctype en_US
gen_locale: gen_locale.c c8tables.h
- $(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) gen_locale.c -o $@
+ $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) gen_locale.c -o $@
#gen_locale.c -o gen_locale
# TODO: if no wide char support, we should auto-disable all UTF-8 locales
@@ -67,7 +67,7 @@ locales.txt:
false; \
fi;
-# ifneq ($(TARGET_ARCH),$(NATIVE_ARCH))
+# ifneq ($(TARGET_ARCH),$(HOST_ARCH))
# locale.mmap: gen_mmap
# echo Your locale.mmap file is either missing or out of date.
@@ -90,7 +90,7 @@ locales.txt:
# ./lmmtolso
gen_ldc: gen_ldc.c c8tables.h wctables.h locale_tables.h
- $(NATIVE_CC) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_mmap) gen_ldc.c -o $@
+ $(HOSTCC) $(HOSTCFLAGS) $(NATIVE_LDFLAGS) $(CFLAGS_mmap) gen_ldc.c -o $@
#gen_ldc.c -o gen_ldc
locale_data.c: gen_ldc