Standardize LIBGCC_DIR

Rules.mak

@@ -52,6 +52,7 @@ UCLIBC_LDSO:=ld-uClibc.so.$(MAJOR_VERSION)
 LIBNAME:=libc.a
 LIBC:=$(TOPDIR)libc/$(LIBNAME)
 LIBGCC:=$(shell $(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)
+LIBGCC_DIR:=$(dir $(LIBGCC))
 
 # Pull in the user's uClibc configuration
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)

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

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];
 	    }

libpthread/Makefile

@@ -36,13 +36,12 @@ ifeq ($(strip $(DODEBUG)),y)
 endif
 endif
 
-GCC_LIB_DIR = $(dir $(shell $(CC) -print-libgcc-file-name ))
 ifeq ($(strip $(DOPIC)),y)
-    START_FILES  = $(TOPDIR)lib/crti.o     $(GCC_LIB_DIR)crtbeginS.o
-    END_FILES    = $(GCC_LIB_DIR)crtendS.o $(TOPDIR)lib/crtn.o
+    START_FILES  = $(TOPDIR)lib/crti.o    $(LIBGCC_DIR)crtbeginS.o
+    END_FILES    = $(LIBGCC_DIR)crtendS.o $(TOPDIR)lib/crtn.o
 else
-    START_FILES  = $(TOPDIR)lib/crti.o    $(GCC_LIB_DIR)crtbegin.o
-    END_FILES    = $(GCC_LIB_DIR)crtend.o $(TOPDIR)lib/crtn.o
+    START_FILES  = $(TOPDIR)lib/crti.o    $(LIBGCC_DIR)crtbegin.o
+    END_FILES    = $(LIBGCC_DIR)crtend.o  $(TOPDIR)lib/crtn.o
 endif
 
 ALL_SUBDIRS = linuxthreads linuxthreads_db