Skip to content

Commit

Permalink
[CPUPL-559] LAPACKE build can use C compiler passed from command line
Browse files Browse the repository at this point in the history
Change-Id: I9b0c05bd70ccff32c8b61f2a9bdac4b36b1bff08
  • Loading branch information
pradeeptrgit committed Dec 19, 2019
1 parent 00e1cf3 commit d6d902b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
uninstall-libs uninstall-lib-symlinks uninstall-headers



# Accept an abbreivated request for verbosity (e.g. 'make V=1 ...')
ifeq ($(V),1)
ENABLE_VERBOSE := yes
Expand Down Expand Up @@ -513,10 +512,10 @@ libflame: check-env $(MK_LIBS)
# --- Static library archiver rules ---
$(LAPACKE_A_PATH):
ifeq ($(ENABLE_VERBOSE),yes)
$(MAKE) -C $(SRC_DIR)/$(LAPACKE_DIR)/LAPACKE
$(MAKE) -e -C $(SRC_DIR)/$(LAPACKE_DIR)/LAPACKE
else
@echo -n "Generating LAPACKE library"
$(MAKE) -C $(SRC_DIR)/$(LAPACKE_DIR)/LAPACKE
$(MAKE) -e -C $(SRC_DIR)/$(LAPACKE_DIR)/LAPACKE
@echo "Generated LAPACKE library"
endif

Expand Down Expand Up @@ -645,7 +644,7 @@ endif

# Run CPP Tests
checkcpp:
$(MAKE) -C $(CPP_TEST_DIR)
$(MAKE) -e -C $(CPP_TEST_DIR)

# --- Install library rules ---

Expand Down
2 changes: 1 addition & 1 deletion testcpp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ TEST_OBJS := $(patsubst $(TEST_SRC_PATH)/%.c, \

$(TEST_OBJ_PATH)/%.o: $(TEST_SRC_PATH)/%.cc
@mkdir -p $(TEST_OBJ_PATH)
$(CXX) $(CXXFLAGS) -c $< -o $@
@$(CXX) $(CXXFLAGS) -c $< -o $@

$(TEST_OBJ_PATH)/libflame_%.o: libflame_%.cc
@$(CXX) $(CXXFLAGS) -c $< -o $@
Expand Down

0 comments on commit d6d902b

Please sign in to comment.