package/Makefile.in: Remove rpath fix as it breaks Thomas png build
Remove my fix for rpath-link until I can find out why it works for me and not Thomas. Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
This commit is contained in:
parent
ab20262575
commit
eff04b41d3
@ -39,8 +39,7 @@ endif
|
||||
ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
|
||||
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
|
||||
-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
|
||||
TARGET_LDFLAGS+= -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
|
||||
TARGET_LDFLAGS+= -Wl,--rpath-link -Wl,$(STAGING_DIR)/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib
|
||||
TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
|
||||
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
|
||||
TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
|
||||
TARGET_LDFLAGS+= $(BR2_SYSROOT)
|
||||
@ -92,8 +91,7 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS)
|
||||
else
|
||||
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include
|
||||
TARGET_CXXFLAGS=$(TARGET_CFLAGS)
|
||||
TARGET_LDFLAGS+= -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
|
||||
TARGET_LDFLAGS+= -Wl,--rpath-link -Wl,$(STAGING_DIR)/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib
|
||||
TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
|
||||
endif
|
||||
#########################################################################
|
||||
#ifeq ($(BR2_ROOTFS_SUFFIX),)
|
||||
|
Loading…
Reference in New Issue
Block a user