summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-03-05 10:55:31 +0000
committerEric Andersen <andersen@codepoet.org>2003-03-05 10:55:31 +0000
commit2e4deeba75e2e6624d05c40f6f1f320733da2cba (patch)
tree28fe4f0fd78d73113c3dcfb860539916e3fbbbad
parent3993c949933052d50ce5f6228880992fb4139d22 (diff)
Patch from Konrad Eisele to omit -Wl,--dynamic-linker from
the gcc wrapper when not building with shared library support.
-rw-r--r--extra/gcc-uClibc/Makefile5
-rw-r--r--extra/gcc-uClibc/gcc-uClibc.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index e312d1792..ff60a2048 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -24,6 +24,11 @@ gcc-uClibc.h: Makefile $(TOPDIR)/.config
@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
+ifeq ($(strip $(HAVE_SHARED)),y)
+ @echo "#define __UCLIBC_HAS_SHARED__ 1" >> gcc-uClibc.h
+else
+ @echo "#undef __UCLIBC_HAS_SHARED__" >> gcc-uClibc.h
+endif
ifeq ($(strip $(UCLIBC_HAS_MMU)),y)
@echo "#define __UCLIBC_HAS_MMU__ 1" >> gcc-uClibc.h
else
diff --git a/extra/gcc-uClibc/gcc-uClibc.c b/extra/gcc-uClibc/gcc-uClibc.c
index 5b002b9d2..b283ed086 100644
--- a/extra/gcc-uClibc/gcc-uClibc.c
+++ b/extra/gcc-uClibc/gcc-uClibc.c
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
char *devprefix;
char *builddir;
char *libstr;
- char *build_dlstr;
+ char *build_dlstr = 0;
char *ep;
char *rpath_link[2];
char *rpath[2];
@@ -220,11 +220,13 @@ int main(int argc, char **argv)
xstrcat(&(our_lib_path[0]), "-L", devprefix, "/lib", NULL);
xstrcat(&(our_lib_path[1]), "-L", builddir, "/lib", NULL);
+#ifdef __UCLIBC_HAS_SHARED__
build_dlstr = "-Wl,--dynamic-linker," BUILD_DYNAMIC_LINKER;
dlstr = getenv("UCLIBC_GCC_DLOPT");
if (!dlstr) {
dlstr = "-Wl,--dynamic-linker," DYNAMIC_LINKER;
}
+#endif
ep = getenv("UCLIBC_GCC");
if (!ep) {