Change from using "TARGET_CC1" to just plan "TARGET_CC"

which is a bit more sensible.

diff --git a/Makefile b/Makefile
index b176fc31c7ed1ea981b1609d7712e22e9289e169..8b97b1e90bea25a88e95f7732c9170fce7c1db22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -137,9 +137,8 @@ PATCH_DIR=$(SOURCE_DIR)/patches
 BUILD_DIR:=$(BASE_DIR)/build
 TARGET_DIR:=$(BUILD_DIR)/root
 STAGING_DIR:=$(BUILD_DIR)/staging_dir
-TARGET_CC:=$(STAGING_DIR)/usr/bin/gcc
 TARGET_CROSS:=$(STAGING_DIR)/bin/$(ARCH)-uclibc-
-TARGET_CC1:=$(TARGET_CROSS)gcc
+TARGET_CC:=$(TARGET_CROSS)gcc
 TARGET_PATH:=$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:/bin:/sbin:/usr/bin:/usr/sbin
 STRIP:=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 #STRIP:=/bin/true

diff --git a/make/autoconf.mk b/make/autoconf.mk
index 5554061a91534354879036ddfe84dd580317ad69..0067702674ad47a5b59e9e1b2494c25525d2de63 100644 (file)
--- a/make/autoconf.mk
+++ b/make/autoconf.mk
@@ -21,7 +21,7 @@ $(AUTOCONF_DIR)/.unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE)
 
 $(AUTOCONF_DIR)/.configured: $(AUTOCONF_DIR)/.unpacked
        (cd $(AUTOCONF_DIR); rm -rf config.cache; PATH=$(STAGING_DIR)/bin:$$PATH \
-               CC=$(TARGET_CC1) EMACS="no" \
+               CC=$(TARGET_CC) EMACS="no" \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -38,10 +38,10 @@ $(AUTOCONF_DIR)/.configured: $(AUTOCONF_DIR)/.unpacked
        touch  $(AUTOCONF_DIR)/.configured
 
 $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY): $(AUTOCONF_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(AUTOCONF_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(AUTOCONF_DIR)
 
 $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY): $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY)
-       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
        $(MAKE) \
            prefix=$(TARGET_DIR)/usr \
            exec_prefix=$(TARGET_DIR)/usr \
@@ -61,7 +61,7 @@ $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY): $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY)
 autoconf: uclibc $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY)
 
 autoconf-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(AUTOCONF_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AUTOCONF_DIR) uninstall
        -$(MAKE) -C $(AUTOCONF_DIR) clean
 
 autoconf-dirclean:

diff --git a/make/automake.mk b/make/automake.mk
index 32b16eaa808c059b94f88479d06cabf4f5a60c0c..02e0d968b608c28cf56a6a0663c1d44db216ce90 100644 (file)
--- a/make/automake.mk
+++ b/make/automake.mk
@@ -21,7 +21,7 @@ $(AUTOMAKE_DIR)/.unpacked: $(DL_DIR)/$(AUTOMAKE_SOURCE)
 
 $(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_DIR)/.unpacked
        (cd $(AUTOMAKE_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -38,11 +38,11 @@ $(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_DIR)/.unpacked
        touch  $(AUTOMAKE_DIR)/.configured
 
 $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY): $(AUTOMAKE_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(AUTOMAKE_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(AUTOMAKE_DIR)
        touch -c $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY)
 
 $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY): $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY)
-       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
        $(MAKE) \
            prefix=$(TARGET_DIR)/usr \
            exec_prefix=$(TARGET_DIR)/usr \
@@ -63,7 +63,7 @@ $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY): $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY)
 automake: uclibc $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY)
 
 automake-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(AUTOMAKE_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AUTOMAKE_DIR) uninstall
        -$(MAKE) -C $(AUTOMAKE_DIR) clean
 
 automake-dirclean:

diff --git a/make/bash.mk b/make/bash.mk
index 0e3b4129612b31c02e4b0cc264c8e68f012ac46b..b7c0547346e3a9f5e8f3b211fa312a402d01e445 100644 (file)
--- a/make/bash.mk
+++ b/make/bash.mk
@@ -21,7 +21,7 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
 
 $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
        (cd $(BASH_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -41,10 +41,10 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
        touch  $(BASH_DIR)/.configured
 
 $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(BASH_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(BASH_DIR)
 
 $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(BASH_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
        mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
        (cd $(TARGET_DIR)/bin; ln -fs bash sh)
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
@@ -53,7 +53,7 @@ $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
 bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 
 bash-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(BASH_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
        -$(MAKE) -C $(BASH_DIR) clean
 
 bash-dirclean:

diff --git a/make/berkeleydb.mk b/make/berkeleydb.mk
index 7c5d083343fe23b28148a7d04848b1d8c456a57a..a907cec6e49b1b690454d53e630115c864eefa52 100644 (file)
--- a/make/berkeleydb.mk
+++ b/make/berkeleydb.mk
@@ -19,7 +19,7 @@ $(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE)
 
 $(DB_DIR)/.configured: $(DB_DIR)/.dist
        (cd $(DB_DIR)/build_unix; rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ../dist/configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -37,11 +37,11 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
        touch  $(DB_DIR)/.configured
 
 $(DB_DIR)/build_unix/.libs/libdb-4.0.so: $(DB_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(DB_DIR)/build_unix
+       $(MAKE) CC=$(TARGET_CC) -C $(DB_DIR)/build_unix
 
 $(STAGING_DIR)/lib/libdb-4.0.so: $(DB_DIR)/build_unix/.libs/libdb-4.0.so
        -mkdir -p $(STAGING_DIR)/man/man1
-       $(MAKE) DESTDIR=$(STAGING_DIR) CC=$(TARGET_CC1) -C $(DB_DIR)/build_unix install 
+       $(MAKE) DESTDIR=$(STAGING_DIR) CC=$(TARGET_CC) -C $(DB_DIR)/build_unix install 
        rm -rf $(STAGING_DIR)/man/man1
 
 $(TARGET_DIR)/lib/libdb-4.0.so: $(STAGING_DIR)/lib/libdb-4.0.so

diff --git a/make/boa.mk b/make/boa.mk
index 2019b7892187c34fd1f266c0e338312458fbbe79..09e2c019be60405d4fed3f7b07cf0b4acd01cee3 100644 (file)
--- a/make/boa.mk
+++ b/make/boa.mk
@@ -21,7 +21,7 @@ $(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE)
        gzip -d -c $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        touch $(BOA_DIR)/.unpacked
 
-$(BOA_WORKDIR)/Makefile: $(TARGET_CC) $(BOA_DIR)/.unpacked
+$(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
        rm -f $(BOA_WORKDIR)/Makefile
        mkdir -p $(BOA_WORKDIR)
        (cd $(BOA_WORKDIR) && CONFIG_SITE=$(SOURCE_DIR)/boa-config.site-$(ARCH) \

diff --git a/make/coreutils.mk b/make/coreutils.mk
index 734e1a4bca853fbb9215d290c637e2821f429b26..a57115b4a2e10a4f05ecf5334d34124119cdd4be 100644 (file)
--- a/make/coreutils.mk
+++ b/make/coreutils.mk
@@ -23,7 +23,7 @@ $(COREUTILS_DIR)/.unpacked: $(DL_DIR)/$(COREUTILS_SOURCE)
 
 $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
        (cd $(COREUTILS_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -41,10 +41,10 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
        touch  $(COREUTILS_DIR)/.configured
 
 $(COREUTILS_DIR)/$(COREUTILS_BINARY): $(COREUTILS_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(COREUTILS_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(COREUTILS_DIR)
 
 $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(COREUTILS_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(COREUTILS_DIR) install
        # some things go in root rather than usr
        for f in $(BIN_PROGS); do \
                mv $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f; \
@@ -59,7 +59,7 @@ $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY)
 coreutils: uclibc $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)
 
 coreutils-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(COREUTILS_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(COREUTILS_DIR) uninstall
        -$(MAKE) -C $(COREUTILS_DIR) clean
 
 coreutils-dirclean:

diff --git a/make/findutils.mk b/make/findutils.mk
index 83bd6e170180bf43ed15a39bbdd4f19c6fcd81f1..0a521cfa29ddb7442c89c27a845fe44d07d2f0e9 100644 (file)
--- a/make/findutils.mk
+++ b/make/findutils.mk
@@ -24,7 +24,7 @@ $(FINDUTILS_DIR)/.unpacked: $(DL_DIR)/$(FINDUTILS_SOURCE)
 
 $(FINDUTILS_DIR)/.configured: $(FINDUTILS_DIR)/.unpacked
        (cd $(FINDUTILS_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -42,17 +42,17 @@ $(FINDUTILS_DIR)/.configured: $(FINDUTILS_DIR)/.unpacked
        touch  $(FINDUTILS_DIR)/.configured
 
 $(FINDUTILS_DIR)/$(FINDUTILS_BINARY): $(FINDUTILS_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(FINDUTILS_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(FINDUTILS_DIR)
 
 $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY): $(FINDUTILS_DIR)/$(FINDUTILS_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(FINDUTILS_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) install
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
 findutils: uclibc $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY)
 
 findutils-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(FINDUTILS_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) uninstall
        -$(MAKE) -C $(FINDUTILS_DIR) clean
 
 findutils-dirclean:

diff --git a/make/gawk.mk b/make/gawk.mk
index 32a6a784237eca307fbd393f5becd751e7a2dbb8..84e85c27ed10a5cc100318a307b6f3a0af39f3de 100644 (file)
--- a/make/gawk.mk
+++ b/make/gawk.mk
@@ -21,7 +21,7 @@ $(GAWK_DIR)/.unpacked: $(DL_DIR)/$(GAWK_SOURCE)
 
 $(GAWK_DIR)/.configured: $(GAWK_DIR)/.unpacked
        (cd $(GAWK_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -39,17 +39,17 @@ $(GAWK_DIR)/.configured: $(GAWK_DIR)/.unpacked
        touch  $(GAWK_DIR)/.configured
 
 $(GAWK_DIR)/$(GAWK_BINARY): $(GAWK_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(GAWK_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(GAWK_DIR)
 
 $(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(GAWK_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GAWK_DIR) install
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
 gawk: uclibc $(TARGET_DIR)/$(GAWK_TARGET_BINARY)
 
 gawk-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(GAWK_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GAWK_DIR) uninstall
        -$(MAKE) -C $(GAWK_DIR) clean
 
 gawk-dirclean:

diff --git a/make/gdb.mk b/make/gdb.mk
index 846035257f4aee2400fa02fe19e7ad4308a03517..d4e304fd6b110e2d720bdc3ce14b78526010f8d4 100644 (file)
--- a/make/gdb.mk
+++ b/make/gdb.mk
@@ -20,7 +20,7 @@ $(GDB_DIR)/.configured: $(GDB_DIR)/.unpacked
                PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
                AS=$(TARGET_CROSS)as LD=$(TARGET_CROSS)ld \
                RANLIB=$(TARGET_CROSS)ranlib NM=$(TARGET_CROSS)nm \
-               CC=$(TARGET_CC1) \
+               CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -43,7 +43,7 @@ $(GDB_DIR)/.configured: $(GDB_DIR)/.unpacked
        touch  $(GDB_DIR)/.configured
 
 $(GDB_DIR)/gdb/gdb: $(GDB_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(GDB_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(GDB_DIR)
        $(STRIP) $(GDB_DIR)/gdb/gdb
 
 $(TARGET_DIR)/usr/bin/gdb: $(GDB_DIR)/gdb/gdb

diff --git a/make/gdbserver.mk b/make/gdbserver.mk
index 575574c9dea1d6c62f2770aaff5dc3e8029c97f2..d2f728d288491b102e34726de1013e90a628711b 100644 (file)
--- a/make/gdbserver.mk
+++ b/make/gdbserver.mk
@@ -15,7 +15,7 @@ $(GDB_WDIR)/.configured: $(GDB_DIR)/.unpacked
                PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
                AS=$(TARGET_CROSS)as LD=$(TARGET_CROSS)ld \
                RANLIB=$(TARGET_CROSS)ranlib NM=$(TARGET_CROSS)nm \
-               CC=$(TARGET_CC1) \
+               CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -37,7 +37,7 @@ $(GDB_WDIR)/.configured: $(GDB_DIR)/.unpacked
        touch  $(GDB_WDIR)/.configured
 
 $(GDB_DIR)/gdb/gdbserver/gdbserver: $(GDB_WDIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(GDB_WDIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(GDB_WDIR)
        $(STRIP) $(GDB_WDIR)/gdbserver
 
 $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_DIR)/gdb/gdbserver/gdbserver

diff --git a/make/jpeg.mk b/make/jpeg.mk
index 92ecb781773e891448300a38340235e99636aeaa..6cb8ec423e48bd742a8b3b672177b8c622b9ed8e 100644 (file)
--- a/make/jpeg.mk
+++ b/make/jpeg.mk
@@ -37,7 +37,7 @@ $(JPEG_DIR)/.unpacked: $(DL_DIR)/$(JPEG_SOURCE)
 $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked
        zcat $(DL_DIR)/$(JPEG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        (cd $(JPEG_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \

diff --git a/make/libglib12.mk b/make/libglib12.mk
index d5227d36c3b47d46729b0e003372fbee826cd714..6519239d56b98c4e17f47a42f52c2b2c1987cf6a 100644 (file)
--- a/make/libglib12.mk
+++ b/make/libglib12.mk
@@ -20,7 +20,7 @@ $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE)
 
 $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
        (cd $(LIBGLIB12_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -39,10 +39,10 @@ $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
        touch  $(LIBGLIB12_DIR)/.configured
 
 $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(LIBGLIB12_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(LIBGLIB12_DIR)
 
 $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINARY)
-       $(MAKE) CC=$(TARGET_CC1) prefix=$(STAGING_DIR) -C $(LIBGLIB12_DIR) install
+       $(MAKE) CC=$(TARGET_CC) prefix=$(STAGING_DIR) -C $(LIBGLIB12_DIR) install
 
 $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY): $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY)
        cp -a $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) $(TARGET_DIR)/lib/

diff --git a/make/libtool.mk b/make/libtool.mk
index 0d1ac56dde9f26c611455b952ac5948881241f0d..aa754a92303c799db996827380ebba0085a6b00a 100644 (file)
--- a/make/libtool.mk
+++ b/make/libtool.mk
@@ -21,7 +21,7 @@ $(LIBTOOL_DIR)/.unpacked: $(DL_DIR)/$(LIBTOOL_SOURCE)
 
 $(LIBTOOL_DIR)/.configured: $(LIBTOOL_DIR)/.unpacked
        (cd $(LIBTOOL_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -39,11 +39,11 @@ $(LIBTOOL_DIR)/.configured: $(LIBTOOL_DIR)/.unpacked
        touch  $(LIBTOOL_DIR)/.configured
 
 $(LIBTOOL_DIR)/$(LIBTOOL_BINARY): $(LIBTOOL_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(LIBTOOL_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(LIBTOOL_DIR)
        touch -c $(LIBTOOL_DIR)/$(LIBTOOL_BINARY)
 
 $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_DIR)/$(LIBTOOL_BINARY)
-       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
        $(MAKE) \
            prefix=$(TARGET_DIR)/usr \
            exec_prefix=$(TARGET_DIR)/usr \
@@ -63,7 +63,7 @@ $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_DIR)/$(LIBTOOL_BINARY)
 libtool: uclibc $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY)
 
 libtool-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(LIBTOOL_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIBTOOL_DIR) uninstall
        -$(MAKE) -C $(LIBTOOL_DIR) clean
 
 libtool-dirclean:

diff --git a/make/links.mk b/make/links.mk
index 9ce78d59bf5f121a922c2aec58b9c59c47e61aee..6aab1f314cd43a8a72136cdb66460c6129bf58a5 100644 (file)
--- a/make/links.mk
+++ b/make/links.mk
@@ -18,7 +18,7 @@ $(LINKS_DIR)/.unpacked: $(DL_DIR)/$(LINKS_SOURCE)
 
 $(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked
        (cd $(LINKS_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -36,7 +36,7 @@ $(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked
        touch  $(LINKS_DIR)/.configured
 
 $(LINKS_DIR)/links: $(LINKS_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(LINKS_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(LINKS_DIR)
        $(STRIP) $(LINKS_DIR)/links
 
 $(TARGET_DIR)/usr/bin/links: $(LINKS_DIR)/links

diff --git a/make/lrzsz.mk b/make/lrzsz.mk
index adbf1ebbb58cb491d1b9cfa6d40ead04ac570a32..0ed34f5975d4f12a0507ac34448ce9c36950e7a0 100644 (file)
--- a/make/lrzsz.mk
+++ b/make/lrzsz.mk
@@ -36,7 +36,7 @@ $(LRZSZ_DIR)/.unpacked: $(DL_DIR)/$(LRZSZ_SOURCE)
 
 $(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked
        (cd $(LRZSZ_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \

diff --git a/make/m4.mk b/make/m4.mk
index fc4ba6abe98a33a597126169f8f837606f169dc2..4c96eda759bfc665607ad444781743f3141f033c 100644 (file)
--- a/make/m4.mk
+++ b/make/m4.mk
@@ -21,7 +21,7 @@ $(M4_DIR)/.unpacked: $(DL_DIR)/$(M4_SOURCE)
 
 $(M4_DIR)/.configured: $(M4_DIR)/.unpacked
        (cd $(M4_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -30,10 +30,10 @@ $(M4_DIR)/.configured: $(M4_DIR)/.unpacked
        touch  $(M4_DIR)/.configured
 
 $(M4_DIR)/src/$(M4_BINARY): $(M4_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(M4_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(M4_DIR)
 
 $(TARGET_DIR)/$(M4_TARGET_BINARY): $(M4_DIR)/src/$(M4_BINARY)
-       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
        $(MAKE) \
            prefix=$(TARGET_DIR)/usr \
            exec_prefix=$(TARGET_DIR)/usr \
@@ -53,7 +53,7 @@ $(TARGET_DIR)/$(M4_TARGET_BINARY): $(M4_DIR)/src/$(M4_BINARY)
 m4: uclibc $(TARGET_DIR)/$(M4_TARGET_BINARY)
 
 m4-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(M4_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(M4_DIR) uninstall
        -$(MAKE) -C $(M4_DIR) clean
 
 m4-dirclean:

diff --git a/make/make.mk b/make/make.mk
index 539dd474d981cdfb47de06104562eda291e45f77..b0a82a83e4721dbbd6b323612cf62391a65147c2 100644 (file)
--- a/make/make.mk
+++ b/make/make.mk
@@ -21,7 +21,7 @@ $(GNUMAKE_DIR)/.unpacked: $(DL_DIR)/$(GNUMAKE_SOURCE)
 
 $(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked
        (cd $(GNUMAKE_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -39,17 +39,17 @@ $(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked
        touch  $(GNUMAKE_DIR)/.configured
 
 $(GNUMAKE_DIR)/$(GNUMAKE_BINARY): $(GNUMAKE_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(GNUMAKE_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(GNUMAKE_DIR)
 
 $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(GNUMAKE_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GNUMAKE_DIR) install
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
 make: uclibc $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
 
 make-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(GNUMAKE_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GNUMAKE_DIR) uninstall
        -$(MAKE) -C $(GNUMAKE_DIR) clean
 
 make-dirclean:

diff --git a/make/mkdosfs.mk b/make/mkdosfs.mk
index 8fba46e87b33dab42cc0ca53fedc3d321c8ca7e7..98288afed30132d624c07a4ffcca068c28082f7c 100644 (file)
--- a/make/mkdosfs.mk
+++ b/make/mkdosfs.mk
@@ -25,7 +25,7 @@ $(MKDOSFS_DIR)/.unpacked: $(DL_DIR)/$(MKDOSFS_SOURCE)
        touch $(MKDOSFS_DIR)/.unpacked
 
 $(MKDOSFS_DIR)/$(MKDOSFS_BINARY): $(MKDOSFS_DIR)/.unpacked
-       $(MAKE) CFLAGS=$(MKDOSFS_CFLAGS) CC=$(TARGET_CC1) -C $(MKDOSFS_DIR);
+       $(MAKE) CFLAGS=$(MKDOSFS_CFLAGS) CC=$(TARGET_CC) -C $(MKDOSFS_DIR);
        $(STRIP) $(MKDOSFS_DIR)/mkdosfs/mkdosfs;
        touch -c $(MKDOSFS_DIR)/mkdosfs/mkdosfs
 
@@ -36,7 +36,7 @@ $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(MKDOSFS_DIR)/$(MKDOSFS_BINARY)
 mkdosfs: uclibc $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
 
 mkdosfs-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(MKDOSFS_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(MKDOSFS_DIR) uninstall
        -$(MAKE) -C $(MKDOSFS_DIR) clean
 
 mkdosfs-dirclean:

diff --git a/make/mke2fs.mk b/make/mke2fs.mk
index 38a593bc25245d0a046ca3a8ac837fe92c3d404c..2d340cb84d37351551e278f7ac657f3f4614675a 100644 (file)
--- a/make/mke2fs.mk
+++ b/make/mke2fs.mk
@@ -21,10 +21,10 @@ $(MKE2FS_DIR)/.unpacked: $(DL_DIR)/$(MKE2FS_SOURCE)
 
 $(MKE2FS_DIR)/.configured: $(MKE2FS_DIR)/.unpacked
        (cd $(MKE2FS_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
-               --with-cc=$(TARGET_CC1) \
+               --with-cc=$(TARGET_CC) \
                --with-linker=$(TARGET_CROSS)ld \
                --prefix=/usr \
                --exec-prefix=/usr \
@@ -44,12 +44,12 @@ $(MKE2FS_DIR)/.configured: $(MKE2FS_DIR)/.unpacked
        touch  $(MKE2FS_DIR)/.configured
 
 $(MKE2FS_DIR)/$(MKE2FS_BINARY): $(MKE2FS_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(MKE2FS_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(MKE2FS_DIR)
        $(STRIP) $(MKE2FS_DIR)/misc/mke2fs $(MKE2FS_DIR)/misc/badblocks;
        touch -c $(MKE2FS_DIR)/misc/mke2fs
 
 $(TARGET_DIR)/$(MKE2FS_TARGET_BINARY): $(MKE2FS_DIR)/$(MKE2FS_BINARY)
-       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(MKE2FS_DIR) install
+       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(MKE2FS_DIR) install
        #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
        #       $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
        # Only install a few selected items...
@@ -60,7 +60,7 @@ $(TARGET_DIR)/$(MKE2FS_TARGET_BINARY): $(MKE2FS_DIR)/$(MKE2FS_BINARY)
 mke2fs: uclibc $(TARGET_DIR)/$(MKE2FS_TARGET_BINARY)
 
 mke2fs-clean:
-       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(MKE2FS_DIR) uninstall
+       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(MKE2FS_DIR) uninstall
        rm -f $(TARGET_DIR)/sbin/mke2fs $(TARGET_DIR)/sbin/badblocks;
        -$(MAKE) -C $(MKE2FS_DIR) clean
 

diff --git a/make/ncurses.mk b/make/ncurses.mk
index 1f5f44866b2ff576b5e88c70a1c4db29e4cdb7d4..5c9e20cf94fc69c3005f2d66e14bded2b5819455 100644 (file)
--- a/make/ncurses.mk
+++ b/make/ncurses.mk
@@ -5,7 +5,7 @@
 #
 #############################################################
 # Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.16 2003/01/17 08:03:59 andersen Exp $
+# $Id: ncurses.mk,v 1.17 2003/01/19 06:07:22 andersen Exp $
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Library General Public License as
@@ -39,7 +39,7 @@ $(NCURSES_DIR)/.dist: $(DL_DIR)/$(NCURSES_SOURCE)
 
 $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.dist
        (cd $(NCURSES_DIR); rm -rf config.cache; PATH=$(STAGING_DIR)/bin:$$PATH \
-               BUILD_CC=$(HOSTCC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC1) \
+               BUILD_CC=$(HOSTCC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -61,12 +61,12 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.dist
        touch  $(NCURSES_DIR)/.configured
 
 $(NCURSES_DIR)/lib/libncurses.so: $(NCURSES_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) HOSTCC=$(HOSTCC) \
+       $(MAKE) CC=$(TARGET_CC) HOSTCC=$(HOSTCC) \
                DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR)
 
 $(STAGING_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so
        PATH=$(STAGING_DIR)/bin:$$PATH BUILD_CC=$(HOSTCC) \
-           HOSTCC=$(HOSTCC) CC=$(TARGET_CC1) $(MAKE) \
+           HOSTCC=$(HOSTCC) CC=$(TARGET_CC) $(MAKE) \
            prefix=$(STAGING_DIR) \
            exec_prefix=$(STAGING_DIR) \
            bindir=$(STAGING_DIR)/bin \

diff --git a/make/netkitbase.mk b/make/netkitbase.mk
index 20706bc501faf7fb3432d25555f7b538bf670788..e0d92c4f63e5cf8353b3a57d0916e60a159ceb32 100644 (file)
--- a/make/netkitbase.mk
+++ b/make/netkitbase.mk
@@ -24,13 +24,13 @@ $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
        touch $(NETKITBASE_DIR)/.unpacked
 
 $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked
-       (cd $(NETKITBASE_DIR); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+       (cd $(NETKITBASE_DIR); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \
        )
        touch  $(NETKITBASE_DIR)/.configured
 
 $(NETKITBASE_DIR)/$(NETKITBASE_BINARY): $(NETKITBASE_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(NETKITBASE_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(NETKITBASE_DIR)
        $(STRIP) $(NETKITBASE_DIR)/$(NETKITBASE_BINARY)
 
 $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY)
@@ -40,14 +40,14 @@ $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY
        mkdir -p $(TARGET_DIR)/etc
        cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/
        perl -i -p -e "s/^([a-z])/#\1/;" $(TARGET_DIR)/etc/inetd.conf
-       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITBASE_DIR) install
+       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITBASE_DIR) install
        #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
        #       $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
 netkitbase: uclibc $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
 
 netkitbase-clean:
-       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITBASE_DIR) uninstall
+       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITBASE_DIR) uninstall
        -rm -f $(TARGET_DIR)/usr/sbin/inetd $(TARGET_DIR)/etc/inetd.conf
        -rm -f $(TARGET_DIR)/etc/inetd.conf
        -$(MAKE) -C $(NETKITBASE_DIR) clean

diff --git a/make/netkittelnet.mk b/make/netkittelnet.mk
index acb01e539748f7034ecb316199632e469a61e519..d1b84cb039e1594155513d11ba69263badf301ad 100644 (file)
--- a/make/netkittelnet.mk
+++ b/make/netkittelnet.mk
@@ -27,13 +27,13 @@ $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
        touch $(NETKITTELNET_DIR)/.unpacked
 
 $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked
-       (cd $(NETKITTELNET_DIR); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+       (cd $(NETKITTELNET_DIR); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \
        )
        touch  $(NETKITTELNET_DIR)/.configured
 
 $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY): $(NETKITTELNET_DIR)/.configured
-       $(MAKE) SUB=telnetd CC=$(TARGET_CC1) -C $(NETKITTELNET_DIR)
+       $(MAKE) SUB=telnetd CC=$(TARGET_CC) -C $(NETKITTELNET_DIR)
        $(STRIP) $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY)
 
 $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY)
@@ -42,14 +42,14 @@ $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_
        cp $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
        # Enable telnet in inetd
        perl -i -p -e "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf
-       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITTELNET_DIR) install
+       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITTELNET_DIR) install
        #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
        #       $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
 netkittelnet: uclibc $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
 
 netkittelnet-clean:
-       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITTELNET_DIR) uninstall
+       #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITTELNET_DIR) uninstall
        -rm -f $(TARGET_DIR)/usr/sbin/telnetd
        -$(MAKE) -C $(NETKITTELNET_DIR) clean
 

diff --git a/make/newt.mk b/make/newt.mk
index ac0c3a1cfdc5b7cddb5bff555c8df46eec360e88..9861302c2246d5a3112817f4e0fb07a6391dc010 100644 (file)
--- a/make/newt.mk
+++ b/make/newt.mk
@@ -25,7 +25,7 @@ $(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE) $(NEWT_PATCH)
 
 $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source
        (cd $(NEWT_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -43,7 +43,7 @@ $(NEWT_DIR)/.configured: $(NEWT_DIR)/.source
        touch $(NEWT_DIR)/.configured;
 
 $(NEWT_DIR)/libnewt.so.0.50.17: $(NEWT_DIR)/.configured
-       $(MAKE) CFLAGS=$(NEWT_CFLAGS) CC=$(TARGET_CC1) -C  $(NEWT_DIR)
+       $(MAKE) CFLAGS=$(NEWT_CFLAGS) CC=$(TARGET_CC) -C  $(NEWT_DIR)
        touch -c $(NEWT_DIR)/libnewt.so.0.50.17
 
 $(STAGING_DIR)/lib/libnewt.so.0.50.17: $(NEWT_DIR)/libnewt.so.0.50.17

diff --git a/make/ntp.mk b/make/ntp.mk
index f7bda2cc271744dd3fbe0b92eb862ed540553f24..6e29565ea4de3bab388f0f373b674ec80cf02765 100644 (file)
--- a/make/ntp.mk
+++ b/make/ntp.mk
@@ -24,7 +24,7 @@ $(NTP_DIR)/.unpacked: $(DL_DIR)/$(NTP_SOURCE)
 
 $(NTP_DIR)/.configured: $(NTP_DIR)/.unpacked
        (cd $(NTP_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -43,17 +43,17 @@ $(NTP_DIR)/.configured: $(NTP_DIR)/.unpacked
        touch  $(NTP_DIR)/.configured
 
 $(NTP_DIR)/$(NTP_BINARY): $(NTP_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(NTP_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(NTP_DIR)
 
 $(TARGET_DIR)/$(NTP_TARGET_BINARY): $(NTP_DIR)/$(NTP_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NTP_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NTP_DIR) install
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
 ntp: uclibc $(TARGET_DIR)/$(NTP_TARGET_BINARY)
 
 ntp-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NTP_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NTP_DIR) uninstall
        -$(MAKE) -C $(NTP_DIR) clean
 
 ntp-dirclean:

diff --git a/make/openssh.mk b/make/openssh.mk
index c356efa06823bf8e9206e2e3ad90442cc502274d..7a00934ae01b4c559a095aaf656bba311c8beff1 100644 (file)
--- a/make/openssh.mk
+++ b/make/openssh.mk
@@ -17,7 +17,7 @@ $(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE)
 
 $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
        (cd $(OPENSSH_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -39,11 +39,11 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
        touch  $(OPENSSH_DIR)/.configured
 
 $(OPENSSH_DIR)/ssh: $(OPENSSH_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(OPENSSH_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(OPENSSH_DIR)
        -$(STRIP) --strip-unneeded $(OPENSSH_DIR)/*.so*
 
 $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh
-       $(MAKE) CC=$(TARGET_CC1) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) install
+       $(MAKE) CC=$(TARGET_CC) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) install
        rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
 openssh: $(TARGET_DIR)/usr/bin/ssh

diff --git a/make/openssl.mk b/make/openssl.mk
index f43a75bff119d78820c88a16ff02f772265fd41b..5792e5841d645c05cd3012036cbd5d94f5be501f 100644 (file)
--- a/make/openssl.mk
+++ b/make/openssl.mk
@@ -26,10 +26,10 @@ $(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
                shared no-idea no-mdc2 no-rc5)
 
 $(OPENSSL_DIR)/apps/openssl: $(OPENSSL_DIR)/Makefile
-       $(MAKE) CC=$(TARGET_CC1) -C $(OPENSSL_DIR) all build-shared
+       $(MAKE) CC=$(TARGET_CC) -C $(OPENSSL_DIR) all build-shared
 
 $(STAGING_DIR)/lib/libcrypto.so.0: $(OPENSSL_DIR)/apps/openssl
-       $(MAKE) CC=$(TARGET_CC1) -C $(OPENSSL_DIR) install
+       $(MAKE) CC=$(TARGET_CC) -C $(OPENSSL_DIR) install
        cp -fa $(OPENSSL_DIR)/libcrypto.so* $(STAGING_DIR)/lib/
        (cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.6 libcrypto.so)
        (cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.6 libcrypto.so.0)

diff --git a/make/pciutils.mk b/make/pciutils.mk
index 4d60ed8b398a40d53229c2c0ccd8040dd11d741a..893b472b0fc0e161002cd5aed1f3c9e5fb74924d 100644 (file)
--- a/make/pciutils.mk
+++ b/make/pciutils.mk
@@ -28,7 +28,7 @@ $(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURC
 
 $(PCIUTILS_DIR)/.configured: $(PCIUTILS_DIR)/.unpacked
        (cd $(PCIUTILS_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -46,7 +46,7 @@ $(PCIUTILS_DIR)/.configured: $(PCIUTILS_DIR)/.unpacked
        touch  $(PCIUTILS_DIR)/.configured
 
 $(PCIUTILS_DIR)/lspci: $(PCIUTILS_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(PCIUTILS_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(PCIUTILS_DIR)
 
 $(TARGET_DIR)/sbin/lspci: $(PCIUTILS_DIR)/lspci
        install -c $(PCIUTILS_DIR)/lspci $(TARGET_DIR)/sbin/lspci
@@ -61,7 +61,7 @@ $(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.dist
 pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids
 
 pciutils-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(PCIUTILS_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(PCIUTILS_DIR) uninstall
        -$(MAKE) -C $(PCIUTILS_DIR) clean
 
 pciutils-dirclean:

diff --git a/make/pcmcia.mk b/make/pcmcia.mk
index cd4c0d3d05cec2b7afd37e03460538b5b5d4e883..a77682260d116f606b0d0dee29196c65218c24cf 100644 (file)
--- a/make/pcmcia.mk
+++ b/make/pcmcia.mk
@@ -43,7 +43,7 @@ $(PCMCIA_DIR)/.patched: $(PCMCIA_DIR)/.unpacked
 $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
        ( cd $(PCMCIA_DIR) ; ./Configure --kernel=$(LINUX_DIR) --noprompt \
                --rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
-               --sysv --kcc=$(HOSTCC) --ucc=$(TARGET_CC1) --ld=$(TARGET_CROSS)ld \
+               --sysv --kcc=$(HOSTCC) --ucc=$(TARGET_CC) --ld=$(TARGET_CROSS)ld \
                --target=$(TARGET_DIR))
        touch $(PCMCIA_DIR)/.configured
 

diff --git a/make/pppd.mk b/make/pppd.mk
index 89eba450101355ecc2bf9b7b86b98cafb450fbf0..2daf27a6688e9114d8e1ef104e5f07f448671759 100644 (file)
--- a/make/pppd.mk
+++ b/make/pppd.mk
@@ -26,7 +26,7 @@ $(PPPD_DIR)/.unpacked: $(DL_DIR)/$(PPPD_SOURCE)
 
 $(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked
        (cd $(PPPD_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -44,10 +44,10 @@ $(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked
        touch  $(PPPD_DIR)/.configured
 
 $(PPPD_DIR)/$(PPPD_BINARY): $(PPPD_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(PPPD_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(PPPD_DIR)
 
 $(TARGET_DIR)/$(PPPD_TARGET_BINARY): $(PPPD_DIR)/$(PPPD_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(PPPD_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(PPPD_DIR) install
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
@@ -57,7 +57,7 @@ pppd-clean:
        rm -f  $(TARGET_DIR)/usr/sbin/pppd
        rm -f  $(TARGET_DIR)/usr/sbin/chat
        rm -rf $(TARGET_DIR)/etc/ppp
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(PPPD_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(PPPD_DIR) uninstall
        -$(MAKE) -C $(PPPD_DIR) clean
 
 pppd-dirclean:

diff --git a/make/rxvt.mk b/make/rxvt.mk
index 3da4beeb2186249b2b7ec3cc05293725a7154b7c..fd85643cda593995c01789e088a1c3e9ded246a1 100644 (file)
--- a/make/rxvt.mk
+++ b/make/rxvt.mk
@@ -38,7 +38,7 @@ $(RXVT_DIR)/.unpacked: $(DL_DIR)/$(RXVT_SOURCE)
 
 $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked
        (cd $(RXVT_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr/X11R6 \
@@ -51,7 +51,7 @@ $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked
        touch  $(RXVT_DIR)/.configured
 
 $(RXVT_BINARY): $(RXVT_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(RXVT_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(RXVT_DIR)
        $(STRIP) -x $(RXVT_BINARY)
 
 $(TARGET_DIR)/usr/X11R6/bin/rxvt: $(RXVT_BINARY)

diff --git a/make/sed.mk b/make/sed.mk
index 6b1691552998a30f7f35df63d2f79f0e5ee013bb..383ba6477e76439efcc3fb86211f31accdc86053 100644 (file)
--- a/make/sed.mk
+++ b/make/sed.mk
@@ -21,7 +21,7 @@ $(SED_DIR)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
 
 $(SED_DIR)/.configured: $(SED_DIR)/.unpacked
        (cd $(SED_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -39,10 +39,10 @@ $(SED_DIR)/.configured: $(SED_DIR)/.unpacked
        touch  $(SED_DIR)/.configured
 
 $(SED_DIR)/$(SED_BINARY): $(SED_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(SED_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(SED_DIR)
 
 $(TARGET_DIR)/$(SED_TARGET_BINARY): $(SED_DIR)/$(SED_BINARY)
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(SED_DIR) install
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR) install
        mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
@@ -50,7 +50,7 @@ $(TARGET_DIR)/$(SED_TARGET_BINARY): $(SED_DIR)/$(SED_BINARY)
 sed: uclibc $(TARGET_DIR)/$(SED_TARGET_BINARY)
 
 sed-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(SED_DIR) uninstall
+       $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR) uninstall
        -sed -C $(SED_DIR) clean
 
 sed-dirclean:

diff --git a/make/slang.mk b/make/slang.mk
index 6dde02f36120723a20d08942e62f826b8acd430f..224061e9c2e87ff9cb113e98982117efcaee196e 100644 (file)
--- a/make/slang.mk
+++ b/make/slang.mk
@@ -17,7 +17,7 @@ $(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
        bzcat $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 
 $(SLANG_DIR)/libslang.so: $(SLANG_DIR)
-       $(MAKE) CFLAGS="-Os -g -fPIC $(SLANG_CFLAGS)" CC=$(TARGET_CC1) -C $(SLANG_DIR)
+       $(MAKE) CFLAGS="-Os -g -fPIC $(SLANG_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR)
        touch -c $(SLANG_DIR)/libslang.so;
 
 $(STAGING_DIR)/lib/libslang.so.1: $(SLANG_DIR)/libslang.so

diff --git a/make/socat.mk b/make/socat.mk
index 9a9fc6019daf80791cd39458579e614e74984987..d64612970e5c2cd841273447d8ee88cc2189e101 100644 (file)
--- a/make/socat.mk
+++ b/make/socat.mk
@@ -23,11 +23,11 @@ $(SOCAT_DIR)/.unpacked:     $(DL_DIR)/$(SOCAT_SOURCE)
        bzip2 -d -c $(DL_DIR)/$(SOCAT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        touch $(SOCAT_DIR)/.unpacked
 
-$(SOCAT_WORKDIR)/Makefile: $(TARGET_CC) $(SOCAT_DIR)/.unpacked
+$(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked
        rm -f $(SOCAT_WORKDIR)/Makefile
        mkdir -p $(SOCAT_WORKDIR)
        (cd $(SOCAT_WORKDIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                $(SOCAT_DIR)/configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \

diff --git a/make/stlport.mk b/make/stlport.mk
index a778b9e79bfe36c95e2e2c5ce92aa138ccf9486d..af60d30550dc2e4b178f355665cd922a96a742fc 100644 (file)
--- a/make/stlport.mk
+++ b/make/stlport.mk
@@ -3,22 +3,6 @@
 # STLport standard C++ library
 #
 #############################################################
-# Copyright (C) 2002 by Erik Andersen <andersen@codepoet.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
 
 STLPORT_DIR=$(BUILD_DIR)/STLport-4.5.3
 STLPORT_SITE=http://www.stlport.org/archive
@@ -30,11 +14,12 @@ $(DL_DIR)/$(STLPORT_SOURCE):
 
 stlport-source: $(DL_DIR)/$(STLPORT_SOURCE) $(STLPORT_PATCH)
 
-$(STLPORT_DIR)/Makefile: $(DL_DIR)/$(STLPORT_SOURCE) $(STLPORT_PATCH)
+$(STLPORT_DIR)/.configured: $(DL_DIR)/$(STLPORT_SOURCE) $(STLPORT_PATCH)
        zcat $(DL_DIR)/$(STLPORT_SOURCE) | tar -C $(BUILD_DIR) -xvf - 
        cat $(STLPORT_PATCH) | patch -d $(STLPORT_DIR) -p1
+       touch -c $(STLPORT_DIR)/.configured
 
-$(STLPORT_DIR)/lib/libstdc++.so.4.5: $(STLPORT_DIR)/Makefile
+$(STLPORT_DIR)/lib/libstdc++.so.4.5: $(STLPORT_DIR)/.configured
        $(MAKE) ARCH=$(ARCH) PREFIX=$(STAGING_DIR) -C $(STLPORT_DIR)
 
 $(STAGING_DIR)/lib/libstdc++.so.4.5: $(STLPORT_DIR)/lib/libstdc++.so.4.5

diff --git a/make/strace.mk b/make/strace.mk
index cab7383d8818a55500ed67df190cb0e64c2903b4..1fd21dbcd24f1afa331f5c14331ca4ffb75a5547 100644 (file)
--- a/make/strace.mk
+++ b/make/strace.mk
@@ -20,7 +20,7 @@ $(STRACE_DIR)/.unpacked: $(DL_DIR)/$(STRACE_SOURCE)
 
 $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked
        (cd $(STRACE_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -38,7 +38,7 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked
        touch  $(STRACE_DIR)/.configured
 
 $(STRACE_DIR)/strace: $(STRACE_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(STRACE_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(STRACE_DIR)
 
 $(TARGET_DIR)/usr/bin/strace: $(STRACE_DIR)/strace
        install -c $(STRACE_DIR)/strace $(TARGET_DIR)/usr/bin/strace

diff --git a/make/tn5250.mk b/make/tn5250.mk
index b02ded7e258d637c1e62fb59048b50fefd602e9f..3ac95e895ff1d6ddb55b0d48111d9c5e4c694a18 100644 (file)
--- a/make/tn5250.mk
+++ b/make/tn5250.mk
@@ -11,7 +11,7 @@ $(TN5250_DIR)/.dist: $(DL_DIR)/$(TN5250_SOURCE)
 
 $(TN5250_DIR)/.configured: $(TN5250_DIR)/.dist
        (cd $(TN5250_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -30,7 +30,7 @@ $(TN5250_DIR)/.configured: $(TN5250_DIR)/.dist
        touch  $(TN5250_DIR)/.configured
 
 $(TN5250_DIR)/tn5250: $(TN5250_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(TN5250_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(TN5250_DIR)
 
 $(TARGET_DIR)/usr/bin/tn5250: $(TN5250_DIR)/tn5250
        install -c $(TN5250_DIR)/tn5250 $(TARGET_DIR)/usr/bin/tn5250

diff --git a/make/valgrind.mk b/make/valgrind.mk
index 566fe2eb9105144e74d28c88a2ed049764373348..221415339466ee310564092d3c00421825529d08 100644 (file)
--- a/make/valgrind.mk
+++ b/make/valgrind.mk
@@ -22,7 +22,7 @@ $(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked
 
 $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched
        (cd $(VALGRIND_DIR); rm -rf config.cache; \
-               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+               PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --prefix=/usr \
@@ -43,12 +43,12 @@ $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched
        touch  $(VALGRIND_DIR)/.configured
 
 $(VALGRIND_DIR)/valgrind.so: $(VALGRIND_DIR)/.configured
-       $(MAKE) CC=$(TARGET_CC1) -C $(VALGRIND_DIR)
+       $(MAKE) CC=$(TARGET_CC) -C $(VALGRIND_DIR)
        -$(STRIP) --strip-unneeded $(VALGRIND_DIR)/*.so*
        touch -c $(VALGRIND_DIR)/valgrind.so
 
 $(TARGET_DIR)/usr/bin/valgrind: $(VALGRIND_DIR)/valgrind.so
-       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+       PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC) \
        $(MAKE) \
            prefix=$(TARGET_DIR)/usr \
            exec_prefix=$(TARGET_DIR)/usr \

diff --git a/make/zlib.mk b/make/zlib.mk
index 638aab7283aeff2a519f393fca0097819fe29336..aaf8f3cad6b8262cc0a0fd745d0919370754be36 100644 (file)
--- a/make/zlib.mk
+++ b/make/zlib.mk
@@ -33,7 +33,7 @@ $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.source
 
 $(ZLIB_DIR)/libz.so.1.1.4: $(ZLIB_DIR)/.configured
        $(MAKE) LDSHARED="$(TARGET_CROSS)ld -shared -soname,libz.so.1" \
-               CFLAGS="$(ZLIB_CFLAGS)" CC=$(TARGET_CC1) -C $(ZLIB_DIR) all libz.a;
+               CFLAGS="$(ZLIB_CFLAGS)" CC=$(TARGET_CC) -C $(ZLIB_DIR) all libz.a;
        touch -c $(ZLIB_DIR)/libz.so.1.1.4
 
 $(STAGING_DIR)/lib/libz.so.1.1.4: $(ZLIB_DIR)/libz.so.1.1.4