diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-11-14 11:13:11 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-11-14 11:13:28 +0000 |
| commit | 8a853e3f0275efc8b05cb195085d45946942744a (patch) | |
| tree | f7b349012231726c54fedd6c19f9cbf8234a4458 /buildtools | |
| parent | 88fab00d4402af240c1b7cc2566133aece115488 (diff) | |
New upstream version 18.11-rc3upstream/18.11-rc3
Change-Id: I958b9d019027ef049bd992b3968a667f3ae382ae
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'buildtools')
| -rwxr-xr-x | buildtools/check-experimental-syms.sh | 6 | ||||
| -rwxr-xr-x | buildtools/gen-build-mk.sh | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/buildtools/check-experimental-syms.sh b/buildtools/check-experimental-syms.sh index d0915102..7d1f3a56 100755 --- a/buildtools/check-experimental-syms.sh +++ b/buildtools/check-experimental-syms.sh @@ -5,6 +5,12 @@ MAPFILE=$1 OBJFILE=$2 +# added check for "make -C test/" usage +if [ ! -e $MAPFILE ] || [ ! -f $OBJFILE ] +then + exit 0 +fi + if [ -d $MAPFILE ] then exit 0 diff --git a/buildtools/gen-build-mk.sh b/buildtools/gen-build-mk.sh index c18b205e..636920b6 100755 --- a/buildtools/gen-build-mk.sh +++ b/buildtools/gen-build-mk.sh @@ -5,7 +5,6 @@ # Auto-generate a Makefile in build directory # Args: # $1: path of project src root -# $2: path of build dir (can be relative to $1) echo "# Automatically generated by gen-build-mk.sh" echo @@ -18,7 +17,7 @@ echo echo "MAKEFLAGS += --no-print-directory" echo echo "all:" -echo " @\$(MAKE) -C $1 O=$2" +echo " @\$(MAKE) -C $1 O=\$(CURDIR)" echo echo "%::" -echo " @\$(MAKE) -C $1 O=$2 \$@" +echo " @\$(MAKE) -C $1 O=\$(CURDIR) \$@" |