ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 02:40:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trick library files going into lib64 if TRICK_FORCE_32BIT is on.

Browse Source 
Added a test for TRICK_FORCE_32BIT and changed the lib directory to
lib instead of lib64.

refs #82
This commit is contained in:
Alex Lin 2015-07-08 14:50:21 -05:00
parent 40a5dc7f17
commit a4f1da2b14
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/trick/makefiles/config_Linux.mk
View File

@ -6,6 +6,9 @@ LD_PARTIAL = -Ur
LD_FILELIST = @ LD_FILELIST = @
# if we are on a Rehat system, the lib directory is lib64 on 64 bit machines # if we are on a Rehat system, the lib directory is lib64 on 64 bit machines
ifeq ($(TRICK_FORCE_32BIT), 1)
TRICK_LIB_DIR := ${TRICK_HOME}/lib
else
ifneq ("$(wildcard /etc/redhat-release)","") ifneq ("$(wildcard /etc/redhat-release)","")
UNAME_M := $(shell uname -m) UNAME_M := $(shell uname -m)
ifeq ($(UNAME_M),x86_64) ifeq ($(UNAME_M),x86_64)
@ -16,6 +19,7 @@ endif
else else
TRICK_LIB_DIR := ${TRICK_HOME}/lib TRICK_LIB_DIR := ${TRICK_HOME}/lib
endif endif
endif
SHARED_LIB_OPT := -shared SHARED_LIB_OPT := -shared
RPATH = -Wl,-rpath=${TRICK_LIB_DIR} RPATH = -Wl,-rpath=${TRICK_LIB_DIR}