Skip to content

Commit

Permalink
Update Makefile for builds with external hwloc and/or lua
Browse files Browse the repository at this point in the history
  • Loading branch information
TomTheBear committed Nov 11, 2024
1 parent c2e384c commit af03458
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ include $(MAKE_DIR)/config_defines.mk
INCLUDES += -I./src/includes -I$(LUA_INCLUDE_DIR) -I$(HWLOC_INCLUDE_DIR) -I$(BUILD_DIR)
LIBS += -ldl

ifeq ($(LUA_INTERNAL),false)
LIBS += -l$(LUA_LIB_NAME)
endif
ifeq ($(USE_INTERNAL_HWLOC),false)
LIBS += -l$(HWLOC_LIB_NAME)
endif

#CONFIGURE BUILD SYSTEM
BUILD_DIR = ./$(COMPILER)
Q ?= @
Expand Down Expand Up @@ -277,7 +270,7 @@ $(STATIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB)

$(DYNAMIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB)
@echo "===> CREATE SHARED LIB $(TARGET_LIB)"
$(Q)${CC} $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB) $(RPATHS)
$(CC) $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB) $(RPATHS)
@ln -sf $(TARGET_LIB) $(TARGET_LIB).$(VERSION).$(RELEASE)
@sed -e s#'@PREFIX@'#$(INSTALLED_PREFIX)#g \
-e s#'@NVIDIA_INTERFACE@'#$(NVIDIA_INTERFACE)#g \
Expand Down

0 comments on commit af03458

Please sign in to comment.