diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-20 20:57:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-20 20:57:02 +0200 |
| commit | f7af2eb9ff9a7c7bf761d1211be835966ff3d661 (patch) | |
| tree | f7054e13efcbd8de9a039c7b59039d5ae19911fd | |
| parent | 1502d361712b92db72fc5b2e96e613c0f09bfadf (diff) | |
| parent | 4192a2be512d211c93d13728fee54433f40c35c0 (diff) | |
Merge branch 'master' of openadk.org:/git/openadk
| -rw-r--r-- | package/musl/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/musl/patches/0.9.12/libgcc.patch | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/package/musl/Makefile b/package/musl/Makefile index 7c7874aa9..4bf8705a6 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -29,9 +29,9 @@ do-install: ${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) (cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \ - ln -sf libc.so ld-musl-$(ARCH).so.1) + ln -sf libc.so ld-musl-$(CPU_ARCH).so.1) (cd $(IDIR_MUSL)/usr/bin && \ - ln -sf ../../lib/ld-musl-$(ARCH).so.1 ldd) + ln -sf ../../lib/ld-musl-$(CPU_ARCH).so.1 ldd) musl-dev-install: diff --git a/toolchain/musl/patches/0.9.12/libgcc.patch b/toolchain/musl/patches/0.9.12/libgcc.patch new file mode 100644 index 000000000..d382ef1fa --- /dev/null +++ b/toolchain/musl/patches/0.9.12/libgcc.patch @@ -0,0 +1,12 @@ +diff -Nur musl-0.9.12.orig/Makefile musl-0.9.12/Makefile +--- musl-0.9.12.orig/Makefile 2013-07-29 09:20:33.000000000 +0200 ++++ musl-0.9.12/Makefile 2013-08-17 16:10:10.000000000 +0200 +@@ -100,7 +100,7 @@ + $(CC) $(CFLAGS_ALL_SHARED) -c -o $@ $< + + lib/libc.so: $(LOBJS) +- $(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -nostdlib -shared \ ++ $(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -static-libgcc -nostdlib -shared \ + -Wl,-e,_start -Wl,-Bsymbolic-functions \ + -o $@ $(LOBJS) $(LIBCC) + |