epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fixes for cross-compiling shared libraries properly.

Browse Source
This commit is contained in:
Andrew Johnson
2006-12-05 19:43:20 +00:00
parent db9f3d81a3
commit 88c68422af
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
configure/os/CONFIG.Common.linux-arm
View File

@@ -6,7 +6,7 @@
# Sites may override these definitions in CONFIG_SITE.Common.linux-arm
#-------------------------------------------------------
# Include definitions common to all Unix targets
# Include definitions common to all Linux targets
include $(CONFIG)/os/CONFIG.Common.linuxCommon
ARCH_CLASS = arm
@@ -14,16 +14,16 @@ ARCH_CLASS = arm
# Set a special definition for network order of Netwinder ARM floating point
ARCH_DEP_CPPFLAGS += -D_ARM_NWFP_
# Set runtime path for shared libraries
SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
ifeq ($(BUILD_CLASS),CROSS)
GNU_TARGET = arm-linux
# Set runtime path for products
PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
# prefix of compiler tools
CMPLR_SUFFIX =
CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
ifdef CROSS
GNU_TARGET=arm-linux
# prefix of compiler tools
CMPLR_SUFFIX=
CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
# Override - use compile-time only path for shared libraries
SHRLIBDIR_LDFLAGS = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
# Override - use compile-time only path for products
PRODDIR_LDFLAGS = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
endif

3
configure/os/CONFIG.linux-x86.linux-arm
View File

@@ -9,9 +9,6 @@ include $(CONFIG)/CONFIG.gnuCommon
GNU_DIR = /usr
# Override the -nostdinc flag, needed here...
CROSS_CPPFLAGS =
# Copied from x86.x86
STATIC_LDFLAGS_YES= -Wl,-Bstatic
STATIC_LDFLAGS_NO=