diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2015-10-31 14:02:41 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2015-11-11 16:58:49 (GMT) |
| commit | 12ef7af27fecb3172d825245d3d0e158b6615b6d (patch) | |
| tree | 40f252c7eb524907acd2159c56ba8d4199025928 | |
| parent | 16ce867a16bf9acb58cd8da730fc80dfa70e6e8d (diff) | |
| download | mxe-12ef7af27fecb3172d825245d3d0e158b6615b6d.zip mxe-12ef7af27fecb3172d825245d3d0e158b6615b6d.tar.gz mxe-12ef7af27fecb3172d825245d3d0e158b6615b6d.tar.bz2 | |
Revert "gcc: cleanup lib installation"
This reverts commit c96a007c6a4b03ca8d43c2ed848c47832f9e2baf.
This commit is not applicable to gcc 4.9.
| -rw-r--r-- | src/gcc.mk | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -55,11 +55,8 @@ define $(PKG)_POST_BUILD rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran) -mv '$(PREFIX)/lib/gcc/$(TARGET)/lib/'* '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/' -mv '$(PREFIX)/lib/gcc/$(TARGET)/'*.dll '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/' - -mv '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' + -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll.a '$(PREFIX)/$(TARGET)/lib/' - - # remove incorrectly installed libcc1 - rm -f '$(PREFIX)/lib/'libcc1* endef define $(PKG)_BUILD_mingw-w64 @@ -97,9 +94,6 @@ define $(PKG)_BUILD_mingw-w64 # build rest of gcc cd '$(1).build' $(MAKE) -C '$(1).build' -j '$(JOBS)' - - # cc1libdir isn't passed to subdirs so install correctly and rm later - $(MAKE) -C '$(1).build/libcc1' -j 1 install cc1libdir='$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)' $(MAKE) -C '$(1).build' -j 1 install $($(PKG)_POST_BUILD) |