diff options
| author | Colin Cross <ccross@android.com> | 2017-06-19 15:42:42 -0700 |
|---|---|---|
| committer | Alexey Ushakov <alexey.v.ushakov@gmail.com> | 2019-02-15 10:52:57 +0300 |
| commit | 5bdbbe90bb3b79c0ebbb709aa136520773fb10fa (patch) | |
| tree | 05c5c7c07fd37ce8359cea7ba0f43667399c9fdc | |
| parent | fdf88c9e6e8ecfc374800c2a8bf960ebe7671cea (diff) | |
| download | jdk8u-5bdbbe90bb3b79c0ebbb709aa136520773fb10fa.tar.gz | |
Make OpenJDK build work with repo .git directoriesjb8u202-b1546jb8u202-b1545jb8u202-b1544jb8u202-b1543jb8u202-b1542jb8u202-b1541jb8u202-b1539jb8u202-b1538jb8u202-b1537jb8u202-b1535jb8u202-b1533jb8u202-b1532jb8u202-b1531jb8u202-b1530jb8u202-b1527jb8u202-b1526jb8u202-b1525jb8u202-b1524jb8u202-b1523jb8u202-b1522jb8u202-b1521jb8u202-b1520jb8u202-b1519jb8u202-b1518jb8u202-b1517jb8u202-b1516jb8u202-b1514.9jb8u202-b1514.8jb8u202-b1514.7jb8u202-b1514.6jb8u202-b1514.5jb8u202-b1514.4jb8u202-b1514.23jb8u202-b1514.22jb8u202-b1514.21jb8u202-b1514.20jb8u202-b1514.2jb8u202-b1514.19jb8u202-b1514.18jb8u202-b1514.17jb8u202-b1514.16jb8u202-b1514.15jb8u202-b1514.11jb8u202-b1514.10jb8u202-b1514.1jb8u202-b1514jb8u202-b1513jb8u202-b1500.2
Repo creates .git directories with a dangling .git/shallow symlink,
which causes a make error:
make[1]: *** No rule to make target `/home/build/out/hotspot/.git/shallow', needed by `/home/build/out/build/linux-x86_64-normal-server-release/hotspot/_hotspot.timestamp'. Stop.
Prune .git directories along with .hg directories.
| -rw-r--r-- | make/HotspotWrapper.gmk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/HotspotWrapper.gmk b/make/HotspotWrapper.gmk index 51437df..99a2b23 100644 --- a/make/HotspotWrapper.gmk +++ b/make/HotspotWrapper.gmk @@ -35,8 +35,8 @@ include MakeBase.gmk default: all -# Get all files except .hg in the hotspot directory. -HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print) +# Get all files except .hg or .git in the hotspot directory. +HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -o -name ".git" -prune -o -print) # The old build creates hotspot output dir before calling hotspot and # not doing it breaks builds on msys. |