diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-09-13 09:31:00 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-09-13 09:31:00 +0200 |
| commit | b51f7f73b94422c8cb2411797b009c85db15f89b (patch) | |
| tree | c128edd2155c7ddff5e48f01b9a870f10000db54 /toolchain | |
| parent | 194b03d5d9dbddc8c00e4da8fcbb0409fcf50d39 (diff) | |
fix half way libgcc headache
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/musl/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/musl/patches/0.9.13/libgcc.patch | 12 |
3 files changed, 6 insertions, 14 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b2ae0ea42..5e168d0d5 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -149,8 +149,6 @@ $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install-gcc install-target-libgcc - # -lgcc_eh workaround - (cd $(STAGING_HOST_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) && ln -sf libgcc.a libgcc_eh.a) touch $@ $(GCC_BUILD_DIR_FINAL)/.configured: diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 91a6add88..b3e02b841 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -17,6 +17,12 @@ $(WRKBUILD)/.headers: touch $@ $(WRKBUILD)/.compiled: + # reconfigure musl, otherwise linking with libgcc is disabled + (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ + ./configure --prefix=/usr \ + --target=$(REAL_GNU_TARGET_NAME) \ + --disable-gcc-wrapper \ + ) $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all touch $@ diff --git a/toolchain/musl/patches/0.9.13/libgcc.patch b/toolchain/musl/patches/0.9.13/libgcc.patch deleted file mode 100644 index d382ef1fa..000000000 --- a/toolchain/musl/patches/0.9.13/libgcc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) - |