Skip to content

Commit 8505def

Browse files
ianlancetaylorianlancetaylor
committed
libgo: install internal/reflectlite.gox
This makes it possible to use gccgo to bootstrap Go 1.14. If we don't install this, gccgo can't compile the sort package. Fixes GCC PR go/93679 Change-Id: Ib224e43ca7cd0a0e16495900a03f609d189ebe50 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/219617 Reviewed-by: Cherry Zhang <[email protected]>
1 parent f368afb commit 8505def

File tree

2 files changed

+54
-14
lines changed

2 files changed

+54
-14
lines changed

‎libgo/Makefile.am

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,11 @@ toolexeclibgounicode_DATA = \
397397
unicode/utf16.gox \
398398
unicode/utf8.gox
399399

400+
# Some internal packages are needed to bootstrap the gc toolchain.
401+
toolexeclibgointernaldir = $(toolexeclibgodir)/internal
402+
toolexeclibgointernal_DATA = \
403+
internal/reflectlite.gox
404+
400405
# Some packages are only needed for tests, so unlike the other
401406
# internal packages nothing will explicitly depend on them.
402407
# Force them to be built.

‎libgo/Makefile.in

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
174174
"$(DESTDIR)$(toolexeclibgoimagedir)" \
175175
"$(DESTDIR)$(toolexeclibgoimagecolordir)" \
176176
"$(DESTDIR)$(toolexeclibgoindexdir)" \
177+
"$(DESTDIR)$(toolexeclibgointernaldir)" \
177178
"$(DESTDIR)$(toolexeclibgoiodir)" \
178179
"$(DESTDIR)$(toolexeclibgologdir)" \
179180
"$(DESTDIR)$(toolexeclibgomathdir)" \
@@ -335,13 +336,14 @@ DATA = $(noinst_DATA) $(toolexeclibgo_DATA) \
335336
$(toolexeclibgoencoding_DATA) $(toolexeclibgogo_DATA) \
336337
$(toolexeclibgohash_DATA) $(toolexeclibgohtml_DATA) \
337338
$(toolexeclibgoimage_DATA) $(toolexeclibgoimagecolor_DATA) \
338-
$(toolexeclibgoindex_DATA) $(toolexeclibgoio_DATA) \
339-
$(toolexeclibgolog_DATA) $(toolexeclibgomath_DATA) \
340-
$(toolexeclibgomime_DATA) $(toolexeclibgonet_DATA) \
341-
$(toolexeclibgonethttp_DATA) $(toolexeclibgonetrpc_DATA) \
342-
$(toolexeclibgoos_DATA) $(toolexeclibgopath_DATA) \
343-
$(toolexeclibgoregexp_DATA) $(toolexeclibgoruntime_DATA) \
344-
$(toolexeclibgosync_DATA) $(toolexeclibgotesting_DATA) \
339+
$(toolexeclibgoindex_DATA) $(toolexeclibgointernal_DATA) \
340+
$(toolexeclibgoio_DATA) $(toolexeclibgolog_DATA) \
341+
$(toolexeclibgomath_DATA) $(toolexeclibgomime_DATA) \
342+
$(toolexeclibgonet_DATA) $(toolexeclibgonethttp_DATA) \
343+
$(toolexeclibgonetrpc_DATA) $(toolexeclibgoos_DATA) \
344+
$(toolexeclibgopath_DATA) $(toolexeclibgoregexp_DATA) \
345+
$(toolexeclibgoruntime_DATA) $(toolexeclibgosync_DATA) \
346+
$(toolexeclibgotesting_DATA) \
345347
$(toolexeclibgotestinginternal_DATA) $(toolexeclibgotext_DATA) \
346348
$(toolexeclibgotexttemplate_DATA) $(toolexeclibgounicode_DATA)
347349
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
@@ -859,6 +861,12 @@ toolexeclibgounicode_DATA = \
859861
unicode/utf8.gox
860862

861863

864+
# Some internal packages are needed to bootstrap the gc toolchain.
865+
toolexeclibgointernaldir = $(toolexeclibgodir)/internal
866+
toolexeclibgointernal_DATA = \
867+
internal/reflectlite.gox
868+
869+
862870
# Some packages are only needed for tests, so unlike the other
863871
# internal packages nothing will explicitly depend on them.
864872
# Force them to be built.
@@ -1850,6 +1858,27 @@ uninstall-toolexeclibgoindexDATA:
18501858
@list='$(toolexeclibgoindex_DATA)'; test -n "$(toolexeclibgoindexdir)" || list=; \
18511859
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
18521860
dir='$(DESTDIR)$(toolexeclibgoindexdir)'; $(am__uninstall_files_from_dir)
1861+
install-toolexeclibgointernalDATA: $(toolexeclibgointernal_DATA)
1862+
@$(NORMAL_INSTALL)
1863+
@list='$(toolexeclibgointernal_DATA)'; test -n "$(toolexeclibgointernaldir)" || list=; \
1864+
if test -n "$$list"; then \
1865+
echo " $(MKDIR_P) '$(DESTDIR)$(toolexeclibgointernaldir)'"; \
1866+
$(MKDIR_P) "$(DESTDIR)$(toolexeclibgointernaldir)" || exit 1; \
1867+
fi; \
1868+
for p in $$list; do \
1869+
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1870+
echo "$$d$$p"; \
1871+
done | $(am__base_list) | \
1872+
while read files; do \
1873+
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(toolexeclibgointernaldir)'"; \
1874+
$(INSTALL_DATA) $$files "$(DESTDIR)$(toolexeclibgointernaldir)" || exit $$?; \
1875+
done
1876+
1877+
uninstall-toolexeclibgointernalDATA:
1878+
@$(NORMAL_UNINSTALL)
1879+
@list='$(toolexeclibgointernal_DATA)'; test -n "$(toolexeclibgointernaldir)" || list=; \
1880+
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1881+
dir='$(DESTDIR)$(toolexeclibgointernaldir)'; $(am__uninstall_files_from_dir)
18531882
install-toolexeclibgoioDATA: $(toolexeclibgoio_DATA)
18541883
@$(NORMAL_INSTALL)
18551884
@list='$(toolexeclibgoio_DATA)'; test -n "$(toolexeclibgoiodir)" || list=; \
@@ -2319,7 +2348,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) config.h \
23192348
all-local
23202349
installdirs: installdirs-recursive
23212350
installdirs-am:
2322-
for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibgodir)" "$(DESTDIR)$(toolexeclibgoarchivedir)" "$(DESTDIR)$(toolexeclibgocompressdir)" "$(DESTDIR)$(toolexeclibgocontainerdir)" "$(DESTDIR)$(toolexeclibgocryptodir)" "$(DESTDIR)$(toolexeclibgocryptox509dir)" "$(DESTDIR)$(toolexeclibgodatabasedir)" "$(DESTDIR)$(toolexeclibgodatabasesqldir)" "$(DESTDIR)$(toolexeclibgodebugdir)" "$(DESTDIR)$(toolexeclibgoencodingdir)" "$(DESTDIR)$(toolexeclibgogodir)" "$(DESTDIR)$(toolexeclibgohashdir)" "$(DESTDIR)$(toolexeclibgohtmldir)" "$(DESTDIR)$(toolexeclibgoimagedir)" "$(DESTDIR)$(toolexeclibgoimagecolordir)" "$(DESTDIR)$(toolexeclibgoindexdir)" "$(DESTDIR)$(toolexeclibgoiodir)" "$(DESTDIR)$(toolexeclibgologdir)" "$(DESTDIR)$(toolexeclibgomathdir)" "$(DESTDIR)$(toolexeclibgomimedir)" "$(DESTDIR)$(toolexeclibgonetdir)" "$(DESTDIR)$(toolexeclibgonethttpdir)" "$(DESTDIR)$(toolexeclibgonetrpcdir)" "$(DESTDIR)$(toolexeclibgoosdir)" "$(DESTDIR)$(toolexeclibgopathdir)" "$(DESTDIR)$(toolexeclibgoregexpdir)" "$(DESTDIR)$(toolexeclibgoruntimedir)" "$(DESTDIR)$(toolexeclibgosyncdir)" "$(DESTDIR)$(toolexeclibgotestingdir)" "$(DESTDIR)$(toolexeclibgotestinginternaldir)" "$(DESTDIR)$(toolexeclibgotextdir)" "$(DESTDIR)$(toolexeclibgotexttemplatedir)" "$(DESTDIR)$(toolexeclibgounicodedir)"; do \
2351+
for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibgodir)" "$(DESTDIR)$(toolexeclibgoarchivedir)" "$(DESTDIR)$(toolexeclibgocompressdir)" "$(DESTDIR)$(toolexeclibgocontainerdir)" "$(DESTDIR)$(toolexeclibgocryptodir)" "$(DESTDIR)$(toolexeclibgocryptox509dir)" "$(DESTDIR)$(toolexeclibgodatabasedir)" "$(DESTDIR)$(toolexeclibgodatabasesqldir)" "$(DESTDIR)$(toolexeclibgodebugdir)" "$(DESTDIR)$(toolexeclibgoencodingdir)" "$(DESTDIR)$(toolexeclibgogodir)" "$(DESTDIR)$(toolexeclibgohashdir)" "$(DESTDIR)$(toolexeclibgohtmldir)" "$(DESTDIR)$(toolexeclibgoimagedir)" "$(DESTDIR)$(toolexeclibgoimagecolordir)" "$(DESTDIR)$(toolexeclibgoindexdir)" "$(DESTDIR)$(toolexeclibgointernaldir)" "$(DESTDIR)$(toolexeclibgoiodir)" "$(DESTDIR)$(toolexeclibgologdir)" "$(DESTDIR)$(toolexeclibgomathdir)" "$(DESTDIR)$(toolexeclibgomimedir)" "$(DESTDIR)$(toolexeclibgonetdir)" "$(DESTDIR)$(toolexeclibgonethttpdir)" "$(DESTDIR)$(toolexeclibgonetrpcdir)" "$(DESTDIR)$(toolexeclibgoosdir)" "$(DESTDIR)$(toolexeclibgopathdir)" "$(DESTDIR)$(toolexeclibgoregexpdir)" "$(DESTDIR)$(toolexeclibgoruntimedir)" "$(DESTDIR)$(toolexeclibgosyncdir)" "$(DESTDIR)$(toolexeclibgotestingdir)" "$(DESTDIR)$(toolexeclibgotestinginternaldir)" "$(DESTDIR)$(toolexeclibgotextdir)" "$(DESTDIR)$(toolexeclibgotexttemplatedir)" "$(DESTDIR)$(toolexeclibgounicodedir)"; do \
23232352
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
23242353
done
23252354
install: install-recursive
@@ -2401,7 +2430,8 @@ install-exec-am: install-exec-local install-toolexeclibLIBRARIES \
24012430
install-toolexeclibgohashDATA install-toolexeclibgohtmlDATA \
24022431
install-toolexeclibgoimageDATA \
24032432
install-toolexeclibgoimagecolorDATA \
2404-
install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
2433+
install-toolexeclibgoindexDATA \
2434+
install-toolexeclibgointernalDATA install-toolexeclibgoioDATA \
24052435
install-toolexeclibgologDATA install-toolexeclibgomathDATA \
24062436
install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
24072437
install-toolexeclibgonethttpDATA \
@@ -2470,8 +2500,10 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
24702500
uninstall-toolexeclibgohtmlDATA \
24712501
uninstall-toolexeclibgoimageDATA \
24722502
uninstall-toolexeclibgoimagecolorDATA \
2473-
uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
2474-
uninstall-toolexeclibgologDATA uninstall-toolexeclibgomathDATA \
2503+
uninstall-toolexeclibgoindexDATA \
2504+
uninstall-toolexeclibgointernalDATA \
2505+
uninstall-toolexeclibgoioDATA uninstall-toolexeclibgologDATA \
2506+
uninstall-toolexeclibgomathDATA \
24752507
uninstall-toolexeclibgomimeDATA uninstall-toolexeclibgonetDATA \
24762508
uninstall-toolexeclibgonethttpDATA \
24772509
uninstall-toolexeclibgonetrpcDATA \
@@ -2512,7 +2544,8 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
25122544
install-toolexeclibgohashDATA install-toolexeclibgohtmlDATA \
25132545
install-toolexeclibgoimageDATA \
25142546
install-toolexeclibgoimagecolorDATA \
2515-
install-toolexeclibgoindexDATA install-toolexeclibgoioDATA \
2547+
install-toolexeclibgoindexDATA \
2548+
install-toolexeclibgointernalDATA install-toolexeclibgoioDATA \
25162549
install-toolexeclibgologDATA install-toolexeclibgomathDATA \
25172550
install-toolexeclibgomimeDATA install-toolexeclibgonetDATA \
25182551
install-toolexeclibgonethttpDATA \
@@ -2543,8 +2576,10 @@ uninstall-am: uninstall-toolexeclibLIBRARIES \
25432576
uninstall-toolexeclibgohtmlDATA \
25442577
uninstall-toolexeclibgoimageDATA \
25452578
uninstall-toolexeclibgoimagecolorDATA \
2546-
uninstall-toolexeclibgoindexDATA uninstall-toolexeclibgoioDATA \
2547-
uninstall-toolexeclibgologDATA uninstall-toolexeclibgomathDATA \
2579+
uninstall-toolexeclibgoindexDATA \
2580+
uninstall-toolexeclibgointernalDATA \
2581+
uninstall-toolexeclibgoioDATA uninstall-toolexeclibgologDATA \
2582+
uninstall-toolexeclibgomathDATA \
25482583
uninstall-toolexeclibgomimeDATA uninstall-toolexeclibgonetDATA \
25492584
uninstall-toolexeclibgonethttpDATA \
25502585
uninstall-toolexeclibgonetrpcDATA \

0 commit comments

Comments
 (0)