summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-11-05 05:56:27 +0000
committerEric Andersen <andersen@codepoet.org>2002-11-05 05:56:27 +0000
commitee1c13e232bc2a2a2758eec133be9c168d3fff7d (patch)
tree864075928aa21282515465fb5a3a88874a137176 /extra
parent9721bee58d9cbd447ed941bd24b0ee5a176410b5 (diff)
Standardize LIBGCC_DIR
Diffstat (limited to 'extra')
-rw-r--r--extra/gcc-uClibc/Makefile5
-rw-r--r--extra/gcc-uClibc/gcc-uClibc.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index 73d59bebb..e3991dcbf 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -10,8 +10,6 @@ include $(TOPDIR)Rules.mak
UCLIBC_DIR = $(shell (cd ../.. ; /bin/pwd))
GCC_BIN = $(shell which $(CC))
LD_BIN = $(shell which $(LD))
-GCC_LIB = $(shell $(CC) -print-libgcc-file-name )
-GCC_LIB_DIR = $(dir $(shell $(CC) -print-libgcc-file-name ))
GCCINCDIR:= ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
all: gcc-uClibc ld-uClibc
@@ -22,8 +20,7 @@ gcc-uClibc.h:
@echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h
@echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h
@echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
- @echo "#define GCC_LIB " \"$(GCC_LIB)\" >> gcc-uClibc.h
- @echo "#define GCC_LIB_DIR " \"$(GCC_LIB_DIR)\" >> gcc-uClibc.h
+ @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h
@echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h
@echo "#define DYNAMIC_LINKER " \"$(DYNAMIC_LINKER)\" >> gcc-uClibc.h
@echo "#define BUILD_DYNAMIC_LINKER " \"$(UCLIBC_DIR)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h
diff --git a/extra/gcc-uClibc/gcc-uClibc.c b/extra/gcc-uClibc/gcc-uClibc.c
index 1974cc150..3ef156862 100644
--- a/extra/gcc-uClibc/gcc-uClibc.c
+++ b/extra/gcc-uClibc/gcc-uClibc.c
@@ -392,9 +392,9 @@ int main(int argc, char **argv)
if (ctor_dtor) {
gcc_argv[i++] = crti_path[use_build_dir];
if (use_pic) {
- gcc_argv[i++] = GCC_LIB_DIR "crtbeginS.o" ;
+ gcc_argv[i++] = LIBGCC_DIR "crtbeginS.o" ;
} else {
- gcc_argv[i++] = GCC_LIB_DIR "crtbegin.o" ;
+ gcc_argv[i++] = LIBGCC_DIR "crtbegin.o" ;
}
}
gcc_argv[i++] = crt0_path[use_build_dir];
@@ -420,9 +420,9 @@ int main(int argc, char **argv)
}
if (ctor_dtor) {
if (use_pic) {
- gcc_argv[i++] = GCC_LIB_DIR "crtendS.o" ;
+ gcc_argv[i++] = LIBGCC_DIR "crtendS.o" ;
} else {
- gcc_argv[i++] = GCC_LIB_DIR "crtend.o" ;
+ gcc_argv[i++] = LIBGCC_DIR "crtend.o" ;
}
gcc_argv[i++] = crtn_path[use_build_dir];
}