[Buildroot] svn commit: trunk/buildroot/package

Roberto A. Foglietta roberto.foglietta at gmail.com
Thu Nov 20 14:56:50 UTC 2008


2008/11/11  <tpetazzoni at uclibc.org>:
> Author: tpetazzoni
> Date: 2008-11-11 10:32:31 -0800 (Tue, 11 Nov 2008)
> New Revision: 24000
>
> Log:
> Fix external toolchain build

While you are looking for a better solution I think this patch will
save internal toolchain users from a lot of problems

roberto at rafbook:~/gles/buildroot$ svn diff -r24103 package/Makefile.in
Index: package/Makefile.in
===================================================================
--- package/Makefile.in (revision 24103)
+++ package/Makefile.in (working copy)
@@ -38,8 +38,10 @@
#########################################################################
ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
- -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include \
- -Wl,--rpath-link -Wl,$(STAGING_DIR)/lib -Wl,--rpath-link
-Wl,$(STAGING_DIR)/usr/lib
+ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+ifneq ($(strip $(BR2_TOOLCHAIN_EXTERNAL)),)
+TARGET_CFLAGS+=-Wl,--rpath-link -Wl,$(STAGING_DIR)/lib
-Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib
+endif
TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
@@ -91,8 +93,10 @@
#########################################################################
else
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
- -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include
-I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include \
- -Wl,--rpath-link -Wl,$(STAGING_DIR)/lib -Wl,--rpath-link
-Wl,$(STAGING_DIR)/usr/lib
+ -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include
-I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include
+ifneq ($(strip $(BR2_TOOLCHAIN_EXTERNAL)),)
+TARGET_CFLAGS+=-Wl,--rpath-link -Wl,$(STAGING_DIR)/lib
-Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib
+endif
TARGET_CXXFLAGS=$(TARGET_CFLAGS)
TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
endif

--
/roberto
-------------- next part --------------
A non-text attachment was scrubbed...
Name: package_Makefile.in.patch
Type: text/x-diff
Size: 1514 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20081120/07d6dfb7/attachment-0002.patch>


More information about the buildroot mailing list