diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-10-13 12:52:35 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-10-25 01:23:28 (GMT) |
| commit | c96a007c6a4b03ca8d43c2ed848c47832f9e2baf (patch) | |
| tree | 28c09784db56a95d0940438211c5ed877043bbb6 /src | |
| parent | 9732e4dc2961070ef9e9e9d839479c0e7490aa18 (diff) | |
| download | mxe-c96a007c6a4b03ca8d43c2ed848c47832f9e2baf.zip mxe-c96a007c6a4b03ca8d43c2ed848c47832f9e2baf.tar.gz mxe-c96a007c6a4b03ca8d43c2ed848c47832f9e2baf.tar.bz2 | |
gcc: cleanup lib installation
Diffstat (limited to 'src')
| -rw-r--r-- | src/gcc.mk | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -55,8 +55,11 @@ 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)/' - -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' + -mv '$(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 @@ -78,6 +81,9 @@ 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) |