diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2015-11-15 23:20:05 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2015-11-15 23:20:05 (GMT) |
commit | 44ad79155db61170fb55d931ee3d030a14a8f5fc (patch) | |
tree | b3701ddef7777e32a3f5093f5294d8d8c6774fb4 /src | |
parent | b83d6e94ab1fb0625107b9039cb232b952fdc178 (diff) | |
parent | 9020e9e0e53cd249a96fc48ee801dce6c28c9316 (diff) | |
download | mxe-44ad79155db61170fb55d931ee3d030a14a8f5fc.zip mxe-44ad79155db61170fb55d931ee3d030a14a8f5fc.tar.gz mxe-44ad79155db61170fb55d931ee3d030a14a8f5fc.tar.bz2 |
Merge pull request #1 from tonytheodore/LuaAndC-downgrade-gcc-to-4-9
gcc: cleanup lib installation
Diffstat (limited to 'src')
-rw-r--r-- | src/gcc.mk | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -53,11 +53,13 @@ endef define $(PKG)_POST_BUILD # TODO: find a way to configure the installation of these correctly - 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/' - -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll.a '$(PREFIX)/$(TARGET)/lib/' + # ignore rm failure as parallel build may have cleaned up, but + # don't wildcard all libs so future additions will be detected + $(and $(BUILD_SHARED), + mv -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)/' + -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/'libgcc_s*.dll + -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/lib/'libgcc_s*.a + -rmdir '$(PREFIX)/lib/gcc/$(TARGET)/lib/') endef define $(PKG)_BUILD_mingw-w64 @@ -97,6 +99,14 @@ define $(PKG)_BUILD_mingw-w64 $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install + # shared libgcc isn't installed to version-specific locations + # so install correctly to avoid clobbering with multiple versions + $(and $(BUILD_SHARED), + $(MAKE) -C '$(1).build/$(TARGET)/libgcc' -j 1 \ + toolexecdir='$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)' \ + SHLIB_SLIBDIR_QUAL= \ + install-shared) + $($(PKG)_POST_BUILD) endef |