diff options
author | Vencislav Atanasov <user890104@freemyipod.org> | 2019-07-28 19:44:23 +0300 |
---|---|---|
committer | Franklin Wei <franklin@rockbox.org> | 2019-07-28 21:00:57 +0200 |
commit | 7f9fc20afa3bcff007da941041ceb0c0d84d8fc3 (patch) | |
tree | c28397eb6de5f942e36811b3f4dbe717e4065d05 /tools | |
parent | d8330c9c18ac227800ed7dc9c6ae72946e92e4fb (diff) | |
download | rockbox-7f9fc20afa3bcff007da941041ceb0c0d84d8fc3.tar.gz rockbox-7f9fc20afa3bcff007da941041ceb0c0d84d8fc3.zip |
Use full_path_subst on more places, to avoid replacing the wrong occurrences in
paths.
If ROOTDIR=/rockbox and BUILDDIR=/rockbox/build-something, it is now possible to
successfully build both target binaries and simulators.
Change-Id: If12d1d5933c5a15feebf627a4f1636dc1e3a67fa
Diffstat (limited to 'tools')
-rw-r--r-- | tools/database/database.make | 2 | ||||
-rw-r--r-- | tools/functions.make | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/database/database.make b/tools/database/database.make index 970aeb5581..c29dd47f9b 100644 --- a/tools/database/database.make +++ b/tools/database/database.make | |||
@@ -14,7 +14,7 @@ createsrc = $(shell cat $(1) > $(3); echo "\#if CONFIG_CODEC == SWCODEC" >> $(3) | |||
14 | echo "\#endif" >> $(3); \ | 14 | echo "\#endif" >> $(3); \ |
15 | echo $(3)) | 15 | echo $(3)) |
16 | 16 | ||
17 | METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)) | 17 | METADATAS := $(call full_path_subst,$(ROOTDIR)/%,../../%,$(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)) |
18 | 18 | ||
19 | SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ | 19 | SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ |
20 | $(METADATAS), \ | 20 | $(METADATAS), \ |
diff --git a/tools/functions.make b/tools/functions.make index a2c715e9e1..518b945320 100644 --- a/tools/functions.make +++ b/tools/functions.make | |||
@@ -24,7 +24,7 @@ preprocess2file = $(SILENT)$(CC) $(PPCFLAGS) $(3) -E -P -x c -include config.h $ | |||
24 | asmdefs2file = $(SILENT)$(CC) $(PPCFLAGS) $(3) -S -x c -o - -include config.h $(1) | \ | 24 | asmdefs2file = $(SILENT)$(CC) $(PPCFLAGS) $(3) -S -x c -o - -include config.h $(1) | \ |
25 | perl -ne 'if(/^_?AD_(\w+):$$/){$$var=$$1}else{/^\W\.(?:word|long)\W(.*)$$/ && $$var && print "\#define $$var $$1\n";$$var=0}' > $(2) | 25 | perl -ne 'if(/^_?AD_(\w+):$$/){$$var=$$1}else{/^\W\.(?:word|long)\W(.*)$$/ && $$var && print "\#define $$var $$1\n";$$var=0}' > $(2) |
26 | 26 | ||
27 | c2obj = $(addsuffix .o,$(basename $(subst $(ROOTDIR),$(BUILDDIR),$(1)))) | 27 | c2obj = $(addsuffix .o,$(basename $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(1)))) |
28 | 28 | ||
29 | a2lnk = $(patsubst lib%.a,-l%,$(notdir $(1))) | 29 | a2lnk = $(patsubst lib%.a,-l%,$(notdir $(1))) |
30 | 30 | ||