riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9072 from cladmi/pr/make/riottools/pkg

Browse Source 
pkg: use RIOTTOOLS variable
This commit is contained in:
Alexandre Abadie 2018-05-04 15:35:36 +02:00 committed by GitHub
commit 48d17e68de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/ccn-lite/Makefile
View File

@ -19,6 +19,6 @@ $(PKG_BUILDDIR)/src/Makefile: $(TOOLCHAIN_FILE)
-DCCNL_RIOT=1 -DRIOT_CFLAGS="$(RIOT_CFLAGS)" -DBUILD_TESTING=OFF . -DCCNL_RIOT=1 -DRIOT_CFLAGS="$(RIOT_CFLAGS)" -DBUILD_TESTING=OFF .
$(TOOLCHAIN_FILE): git-download $(TOOLCHAIN_FILE): git-download
$(RIOTBASE)/dist/tools/cmake/generate-xcompile-toolchain.sh > $(TOOLCHAIN_FILE) $(RIOTTOOLS)/cmake/generate-xcompile-toolchain.sh > $(TOOLCHAIN_FILE)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

2
pkg/relic/Makefile
View File

@ -20,7 +20,7 @@ $(PKG_BUILDDIR)/Makefile: $(TOOLCHAIN_FILE)
-DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) . -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) .
$(TOOLCHAIN_FILE): fix_source $(TOOLCHAIN_FILE): fix_source
$(RIOTBASE)/dist/tools/cmake/generate-xcompile-toolchain.sh > $(TOOLCHAIN_FILE) $(RIOTTOOLS)/cmake/generate-xcompile-toolchain.sh > $(TOOLCHAIN_FILE)
fix_source: git-download fix_source: git-download
./fix-util_print_wo_args.sh $(PKG_BUILDDIR) ./fix-util_print_wo_args.sh $(PKG_BUILDDIR)