Commit cccb1086 authored by Lucas Russo's avatar Lucas Russo

Merge branch 'devel'

Hotfix: building with clang
Hotfix: unused variable on some compilation options

Version v0.2.1
parents 7a8e4912 034acb49
......@@ -161,7 +161,7 @@ CFLAGS_DEBUG += -g
# Specific platform Flags
CFLAGS_PLATFORM = -Wall -Wextra -Werror
LDFLAGS_PLATFORM = -T $(LD_SCRIPT)
LDFLAGS_PLATFORM = -Wl,-T,$(LD_SCRIPT)
# Libraries
LIBS = -lm -lzmq -lczmq -lmlm
......@@ -202,7 +202,7 @@ INCLUDE_DIRS = $(boards_INCLUDE_DIRS) \
# Merge all flags. We expect tghese variables to be appended to the possible
# command-line options
override CFLAGS += $(CFLAGS_USR) $(CFLAGS_PLATFORM) $(CFLAGS_DEBUG) $(CPPFLAGS) $(CXXFLAGS)
override LDFLAGS += $(LFLAGS) $(LDFLAGS_PLATFORM)
override LDFLAGS += $(LDFLAGS_PLATFORM)
# Output modules
OUT = $(dev_mngr_OUT) $(dev_io_OUT)
......@@ -274,7 +274,7 @@ all: cfg $(OUT)
# Output Rule
$(OUT): $$($$@_OBJS) $(revision_OBJS)
$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDE_DIRS) -o $@ $^ $($@_STATIC_LIBS) $(LIBS) $($@_LIBS) $(PROJECT_LIBS)
$(CC) $(LDFLAGS) $(LFLAGS) $(CFLAGS) $(INCLUDE_DIRS) -o $@ $^ $($@_STATIC_LIBS) $(LIBS) $($@_LIBS) $(PROJECT_LIBS)
# Special rule for the revision object
$(revision_OBJS): $(revision_SRCS)
......
......@@ -261,7 +261,6 @@ int main (int argc, char *argv[])
/* Spawn the Configure DEVIO to get the uTCA slot number. This is only
* available in AFCv3 */
bpm_client_t *client_cfg = NULL;
#if defined (__BOARD_AFCV3__) && (__WITH_DEVIO_CFG__)
int child_devio_cfg_pid = 0;
if (llio_type == PCIE_DEV) {
......@@ -286,6 +285,7 @@ int main (int argc, char *argv[])
/* FE DEVIO is expected to have a correct dev_id. So, we don't need to get it
* from Hardware */
bpm_client_t *client_cfg = NULL;
if (devio_type == BE_DEVIO) {
/* At this point, the Config DEVIO is ready to receive our commands */
char devio_config_service_str [DEVIO_SERVICE_LEN];
......@@ -456,7 +456,9 @@ err_devio_log_filename_alloc:
devio_destroy (&devio);
err_card_slot:
#if defined (__BOARD_AFCV3__) && (__WITH_DEVIO_CFG__)
bpm_client_destroy (&client_cfg);
if (client_cfg != NULL) {
bpm_client_destroy (&client_cfg);
}
err_client_cfg:
/* Kill DEVIO Config process */
kill (child_devio_cfg_pid, DEVIO_KILL_CFG_SIGNAL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment