[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] odd/multiarch 0c52510 3/8: Revert "Install gcc runti
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] odd/multiarch 0c52510 3/8: Revert "Install gcc runtime libraries before building default targets" |
Date: |
Sat, 27 Apr 2019 09:59:22 -0400 (EDT) |
branch: odd/multiarch
commit 0c52510519d338775767abe9337dd58754806451
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Revert "Install gcc runtime libraries before building default targets"
This reverts commit a06270feeb7973a7f1e0c2374de5fbb545e86bb6, which the
last commit before the present one rendered unnecessary. See:
https://lists.nongnu.org/archive/html/lmi/2019-04/msg00042.html
---
workhorse.make | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/workhorse.make b/workhorse.make
index 79a30c5..f89fe50 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1056,22 +1056,19 @@ data_files := \
help_files := \
$(wildcard $(addprefix $(srcdir)/,*.html)) \
-.PHONY: preinstall
-preinstall:
- @[ -z "$(compiler_runtime_files)" ] \
- || $(CP) --preserve --update $(compiler_runtime_files) $(localbindir)
-
.PHONY: install
-install: preinstall $(default_targets)
+install: $(default_targets)
address@hidden -d $(exec_prefix) ] || $(MKDIR) --parents
$(exec_prefix)
address@hidden -d $(bindir) ] || $(MKDIR) --parents $(bindir)
address@hidden -d $(datadir) ] || $(MKDIR) --parents $(datadir)
address@hidden -d $(test_dir) ] || $(MKDIR) --parents $(test_dir)
address@hidden -d $(touchstone_dir) ] || $(MKDIR) --parents
$(touchstone_dir)
- @$(CP) --preserve --update $(default_targets) $(bindir)
+ @$(CP) --preserve --update $^ $(bindir)
@$(CP) --preserve --update $(data_files) $(datadir)
@$(CP) --preserve --update $(help_files) $(datadir)
@datadir=$(datadir) srcdir=$(srcdir) $(srcdir)/mst_to_xst.sh
+ @[ -z "$(compiler_runtime_files)" ] \
+ || $(CP) --preserve --update $(compiler_runtime_files)
/opt/lmi/local/bin
ifeq (,$(USE_SO_ATTRIBUTES))
@cd $(datadir); $(PERFORM) $(bindir)/product_files$(EXEEXT)
else
- [lmi-commits] [lmi] odd/multiarch updated (62e0e85 -> 723fd45), Greg Chicares, 2019/04/27
- [lmi-commits] [lmi] odd/multiarch 9170c01 1/8: Add a missing word to a comment, Greg Chicares, 2019/04/27
- [lmi-commits] [lmi] odd/multiarch 0c52510 3/8: Revert "Install gcc runtime libraries before building default targets",
Greg Chicares <=
- [lmi-commits] [lmi] odd/multiarch e37d450 2/8: Copy compiler runtime files to build directory, Greg Chicares, 2019/04/27
- [lmi-commits] [lmi] odd/multiarch 8af108a 4/8: Rework the 'install' target to support multiple architectures [351], Greg Chicares, 2019/04/27
- [lmi-commits] [lmi] odd/multiarch 894cbe9 5/8: Remove unnecessary host specifications, Greg Chicares, 2019/04/27
- [lmi-commits] [lmi] odd/multiarch 723fd45 8/8: When eviscerating, also remove the bin/ subdirectory, Greg Chicares, 2019/04/27
- [lmi-commits] [lmi] odd/multiarch dd609f5 7/8: Copy compiler runtime files to $(bindir) without '--update', as intended, Greg Chicares, 2019/04/27
- [lmi-commits] [lmi] odd/multiarch 155086d 6/8: Improve $log_dir concinnity, Greg Chicares, 2019/04/27