diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2020-06-29 22:33:05 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2020-06-29 22:33:05 -0700 |
| commit | 5125da301ca0a1680c26b5d9f574dc174fdfa98c (patch) | |
| tree | db93815340f8e87080791cf7bc93e135234e9387 /testcase/wildcard_cache.mk | |
| parent | e184ff147273cfd25d37692dba4be72eca571e9f (diff) | |
| parent | 06a798c4db92ec3a3a6b3a4b52026f002002affa (diff) | |
| download | platform_build_kati-5125da301ca0a1680c26b5d9f574dc174fdfa98c.tar.gz platform_build_kati-5125da301ca0a1680c26b5d9f574dc174fdfa98c.tar.bz2 platform_build_kati-5125da301ca0a1680c26b5d9f574dc174fdfa98c.zip | |
* aosp/upstream:
Support git submodules in version.cc generation.
Link ckati against jemalloc if host machine runs Linux.
Support building in a git worktree
Fix flaky test
Switch to a golang-based test runner
Refactor source tree into directories
Test: treehugger
Change-Id: I6cca6108531c4c32e3848bf6b532a99aef0f06c2
Diffstat (limited to 'testcase/wildcard_cache.mk')
| -rw-r--r-- | testcase/wildcard_cache.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testcase/wildcard_cache.mk b/testcase/wildcard_cache.mk index 83ba3db..957e4c2 100644 --- a/testcase/wildcard_cache.mk +++ b/testcase/wildcard_cache.mk @@ -1,7 +1,7 @@ # TODO(c): Fix this. Maybe $(wildcard) always runs at eval-phase. # GNU make 4 agrees with ckati. -MAKEVER:=$(shell make --version | ruby -n0e 'puts $$_[/Make (\d)/,1]') +MAKEVER:=$(shell make --version | grep "Make [0-9]" | sed -E 's/.*Make ([0-9]).*/\1/') ifeq ($(MAKE)$(MAKEVER),make4) $(error test skipped) endif |