RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: build: add absolute path for topdir 

We'll need TOPDIR to be ./ but library-test is intentionally built
outside of the git repository so we need to make them separate.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-10-13 20:04:37 +02:00
parent 5286ec58f5
commit aafb4593fe
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -59,6 +59,7 @@ DEBUG_LDFLAGS_DEFAULT =
DEBUG_LDFLAGS_INTERNAL = DEBUG_LDFLAGS_INTERNAL =
DEBUG_LDFLAGS := DEBUG_LDFLAGS :=
ABSTOPDIR = $(shell pwd)
TOPDIR := $(shell pwd) TOPDIR := $(shell pwd)
# Common build flags # Common build flags
@ -487,7 +488,7 @@ library-test: library-test.c $(libs_shared)
@echo " [TEST PREP] $@"$(eval TMPD=$(shell mktemp -d)) @echo " [TEST PREP] $@"$(eval TMPD=$(shell mktemp -d))
$(Q)mkdir -p $(TMPD)/include/btrfs && \ $(Q)mkdir -p $(TMPD)/include/btrfs && \
cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \ cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(TOPDIR)/,$^) -Wl,-rpath=$(TOPDIR) -lbtrfs cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(ABSTOPDIR)/,$^) -Wl,-rpath=$(ABSTOPDIR) -lbtrfs
@echo " [TEST RUN] $@" @echo " [TEST RUN] $@"
$(Q)cd $(TMPD) && ./$@ $(Q)cd $(TMPD) && ./$@
@echo " [TEST CLEAN] $@" @echo " [TEST CLEAN] $@"
@ -497,7 +498,7 @@ library-test.static: library-test.c $(libs_static)
@echo " [TEST PREP] $@"$(eval TMPD=$(shell mktemp -d)) @echo " [TEST PREP] $@"$(eval TMPD=$(shell mktemp -d))
$(Q)mkdir -p $(TMPD)/include/btrfs && \ $(Q)mkdir -p $(TMPD)/include/btrfs && \
cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \ cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(TOPDIR)/,$^) $(STATIC_LDFLAGS) $(STATIC_LIBS) cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(ABSTOPDIR)/,$^) $(STATIC_LDFLAGS) $(STATIC_LIBS)
@echo " [TEST RUN] $@" @echo " [TEST RUN] $@"
$(Q)cd $(TMPD) && ./$@ $(Q)cd $(TMPD) && ./$@
@echo " [TEST CLEAN] $@" @echo " [TEST CLEAN] $@"