diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-31 10:50:27 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-31 11:02:32 +0100 |
| commit | fe367205f592a8672427a8ab17009a8fc2695ca5 (patch) | |
| tree | 55de4b67973ccd5c73158cb1c1e6a9c59ac52be5 | |
| parent | 93d73b21a6e9fbc62bc5cf80cb360b74aef76fad (diff) | |
configure only looks in $MINGW_SYSROOT
Change-Id: I8882525ae6ae24957d9e34fc1ab8d5525251889c
| -rw-r--r-- | external/CustomTarget_mingw_dlls.mk | 9 | ||||
| -rw-r--r-- | m4/mingw.m4 | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/external/CustomTarget_mingw_dlls.mk b/external/CustomTarget_mingw_dlls.mk index c1d240c5bbb7..6bac40b84fe8 100644 --- a/external/CustomTarget_mingw_dlls.mk +++ b/external/CustomTarget_mingw_dlls.mk @@ -65,18 +65,11 @@ MINGW_DLLS := \ $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \ $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) -POTENTIAL_MINGW_RUNTIME_BINDIRS := \ - $(COMPATH)/$(HOST_PLATFORM)/sys-root/mingw/bin \ - /usr/$(HOST_PLATFORM)/sys-root/mingw/bin - $(eval $(call gb_CustomTarget_register_targets,external/wine,\ $(MINGW_DLLS) \ )) -$(call gb_CustomTarget_get_workdir,external/mingw-dlls)/%.dll: $(firstword $(wildcard $(foreach dir,$(POTENTIAL_MINGW_RUNTIME_BINDIRS), $(dir)/%))) - if ! test -f $<; then \ - echo Could not find $*.dll in any of $(POTENTIAL_MINGW_RUNTIME_BINDIRS); \ - fi +$(call gb_CustomTarget_get_workdir,external/mingw-dlls)/%.dll : $(MINGW_SYSROOT)/mingw/bin/%.dll $(call gb_Output_announce,$*,$(true),CPY,1) cp $< $* diff --git a/m4/mingw.m4 b/m4/mingw.m4 index c7ab21d1e78a..eb2dadbab9df 100644 --- a/m4/mingw.m4 +++ b/m4/mingw.m4 @@ -47,8 +47,7 @@ AC_DEFUN([libo_MINGW_CHECK_DLL], [AC_ARG_VAR([MINGW_][$1][_DLL],[output variable containing the found dll name])dnl if test -n "$WITH_MINGW"; then - dnl TODO move this to configure: there is no need to call $CC more than once - _libo_mingw_dlldir=`$CC -print-sysroot`/mingw/bin + _libo_mingw_dlldir="[$MINGW_SYSROOT]"/mingw/bin _libo_mingw_dllname= AC_MSG_CHECKING([for $2 dll]) |