ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Data products will not compile if TRICK_FORCE_32BIT is set.

Browse Source 
The makefiles need to compile the units directory and they were
not at this time.  The units need to be compiled in the native
bit size regardless of whether we are forcing 32 bit or not.

refs #225
This commit is contained in:
Alex Lin 2016-04-18 09:57:59 -05:00
parent 6c991fae31
commit af781d5383
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trick_source/data_products/makefile
View File

@ -8,7 +8,8 @@ LIB_DIR = lib_${TRICK_HOST_CPU}
LIBDIRS = Var \
Log \
EQParse
EQParse \
units
ifneq ("$(wildcard fermi-ware)","")
LIBDIRS += fermi-ware

1
trick_source/data_products/units/include
View File

@ -1 +0,0 @@
../../trick_utils/units/include

14
trick_source/data_products/units/makefile
View File

@ -1,4 +1,6 @@
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
CC = cc
CPP = c++
@ -13,7 +15,7 @@ endif
OBJ_DIR = object_${TRICK_HOST_CPU}
LIBDIR = ../lib_${TRICK_HOST_CPU}
LIBNAME = libtrick_units.a
INCLUDE_DIRS = -Iinclude
INCLUDE_DIRS = -I${TRICK_HOME}/include
DP_CFLAGS = -g ${INCLUDE_DIRS} -fPIC
CPP_OBJECTS = $(OBJ_DIR)/UCFn.o \
@ -38,18 +40,8 @@ $(LIBDIR):
OBJECTS: $(CPP_OBJECTS)
ifeq ($(TRICK_FORCE_32BIT), 1)
$(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIB_DIR)
ar crs $(LIBDIR)/$(LIBNAME) $?
else
ifeq ($(TRICK_HOME),)
$(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIB_DIR)
ar crs $(LIBDIR)/$(LIBNAME) $?
else
$(LIBDIR)/$(LIBNAME): $(LIBDIR)
ln -sf ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/libtrick_units.a $(LIBDIR)/$(LIBNAME)
endif
endif
depend:
@ echo "No depend rule for this directory"