diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 6 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index f7dd40af4..5770081b3 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -351,20 +351,20 @@ $(PROJECT_BUILD_DIR)/autotools-stamps/gcc_libs_target_installed: $(GCC_BUILD_DIR ifeq ($(BR2_GCC_SHARED_LIBGCC),y) # These are in /lib, so... rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* - -cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* \ + -cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcc_s* \ $(TARGET_DIR)/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgcc_s* endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) ifeq ($(BR2_GCC_SHARED_LIBGCC),y) mkdir -p $(TARGET_DIR)/usr/lib - -cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* \ + -cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libstdc++.so* \ $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so* endif endif ifeq ($(BR2_INSTALL_LIBGCJ),y) - cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcj.so* $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcj.so* $(TARGET_DIR)/usr/lib/ mkdir -p $(TARGET_DIR)/usr/lib/security cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \ $(TARGET_DIR)/usr/lib/security/ diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 8a98d3557..13acecc94 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -49,9 +49,9 @@ config BR2_KERNEL_HEADERS_RT config BR2_DEFAULT_KERNEL_HEADERS string default "2.6.26.8" if BR2_KERNEL_HEADERS_2_6_26 - default "2.6.27.25" if BR2_KERNEL_HEADERS_2_6_27 + default "2.6.27.26" if BR2_KERNEL_HEADERS_2_6_27 default "2.6.28.10" if BR2_KERNEL_HEADERS_2_6_28 - default "2.6.29.5" if BR2_KERNEL_HEADERS_2_6_29 - default "2.6.30" if BR2_KERNEL_HEADERS_2_6_30 + default "2.6.29.6" if BR2_KERNEL_HEADERS_2_6_29 + default "2.6.30.1" if BR2_KERNEL_HEADERS_2_6_30 default "2.6" if BR2_KERNEL_HEADERS_SNAP |