emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #146 from mingnus/master

Browse Source 
[build] Fix the default value for the AR variable (#145)
This commit is contained in:
Joe Thornber 2020-07-29 08:13:23 +01:00 committed by GitHub
commit 71545e56c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -149,6 +149,7 @@ endif
CC:=@CC@ CC:=@CC@
CXX:=@CXX@ CXX:=@CXX@
AR:=@AR@
STRIP:=@STRIP@ STRIP:=@STRIP@
OBJECTS:=$(subst .cc,.o,$(SOURCE)) OBJECTS:=$(subst .cc,.o,$(SOURCE))
@ -187,7 +188,6 @@ ifeq ("@STATIC@", "yes")
LDFLAGS+=-static LDFLAGS+=-static
endif endif
AR:=@AR@
INSTALL:=@INSTALL@ INSTALL:=@INSTALL@
PREFIX:=@prefix@ PREFIX:=@prefix@
BINDIR:=$(DESTDIR)$(PREFIX)/sbin BINDIR:=$(DESTDIR)$(PREFIX)/sbin

3
configure.ac
View File

@ -44,6 +44,9 @@ AC_PROG_INSTALL
AC_DEFUN([AC_PROG_STRIP], [AC_CHECK_TOOL(STRIP, strip, :)]) AC_DEFUN([AC_PROG_STRIP], [AC_CHECK_TOOL(STRIP, strip, :)])
AC_PROG_STRIP AC_PROG_STRIP
AC_ARG_VAR(STRIP, [Command for discarding symbols from object files]) AC_ARG_VAR(STRIP, [Command for discarding symbols from object files])
AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
AC_PROG_AR
AC_ARG_VAR(AR, [Program that maintains archive files])
################################################################ ################################################################
dnl -- Check for large file support dnl -- Check for large file support

4
unit-tests/Makefile.in
View File

@ -40,7 +40,7 @@ lib/libgmock.a: $(GMOCK_DEPS)
@echo " [CXX] gmock" @echo " [CXX] gmock"
$(V) $(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -std=c++11 -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc $(V) $(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -std=c++11 -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc
@echo " [AR] $<" @echo " [AR] $<"
$(V)$(AR) -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1 $(V) $(AR) -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1
TEST_SOURCE=\ TEST_SOURCE=\
unit-tests/gmock_main.cc \ unit-tests/gmock_main.cc \
@ -89,7 +89,7 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE))
unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
@echo " [LD] $<" @echo " [LD] $<"
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT) $(V) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
.PHONY: unit-test .PHONY: unit-test