Skip to content

Commit

Permalink
Fix build with newest Ada fuse library to configure it
Browse files Browse the repository at this point in the history
  • Loading branch information
stcarrez committed Feb 13, 2021
1 parent b47c987 commit e9c4441
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ FUSE_LIBS := $(shell pkg-config --libs fuse)
export FUSE_LIBS

ifeq ($(USE_GIT_FUSE),yes)
ADA_FUSE_SYSTEM := $(shell uname -sm)
ADA_FUSE_SYSTEM := $(shell uname -sm | sed "s- -_-g")
export ADA_FUSE_SYSTEM
endif

Expand All @@ -28,7 +28,7 @@ build-test:: setup

build:: tools

tools: tools/akt-configs.ads
tools: tools/akt-configs.ads setup
$(GNATMAKE) $(GPRFLAGS) -p -P$(NAME)_tools $(MAKE_ARGS)

tools/akt-configs.ads: Makefile.conf tools/akt-configs.gpb
Expand Down Expand Up @@ -59,6 +59,15 @@ install::

endif

ifeq ($(HAVE_FUSE),yes)
ifeq ($(USE_GIT_FUSE),yes)

setup:: ada-fuse/ada_fuse.gpr
cd ada-fuse && ./setup.py

endif
endif

# Build and run the unit tests
test: build stamp-test-setup
bin/keystore_harness -l $(NAME): -t 120 -xml keystore-aunit.xml -config tests.properties
Expand Down

0 comments on commit e9c4441

Please sign in to comment.