diff options
| author | Enrico Tassi | 2020-07-05 20:13:44 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2020-07-05 20:13:44 +0200 |
| commit | cea10e4e16c05b06693184425dd70ce6e5eba8a8 (patch) | |
| tree | 167f4dfadd2685b39bfa0d8fc4f550f1cd2efc6a | |
| parent | 0545c9402310efe0656793197c996d04d554ecb8 (diff) | |
| parent | 6eecb3c9fc12317e3d753db54794244530991173 (diff) | |
Merge PR #12641: Windows build: use architecture dependent version of windres
Reviewed-by: gares
| -rw-r--r-- | Makefile.ide | 6 | ||||
| -rwxr-xr-x | dev/build/windows/makecoq_mingw.sh | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.ide b/Makefile.ide index 640ee7b188..789acee5ec 100644 --- a/Makefile.ide +++ b/Makefile.ide @@ -296,10 +296,12 @@ $(COQIDEAPP):$(COQIDEAPP)/Contents/Resources # CoqIde for Windows special targets ########################################################################### +# This is either x86_64-w64-mingw32 or i686-w64-mingw32 +TARGET_ARCH=$(shell $CC -dumpmachine) + %.o: %.rc $(SHOW)'WINDRES $<' - $(HIDE)i686-w64-mingw32-windres -i $< -o $@ - + $(HIDE)$(TARGET_ARCH)-windres -i $< -o $@ # For emacs: # Local Variables: diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh index 6ceb7f54b2..cc9fd13fdc 100755 --- a/dev/build/windows/makecoq_mingw.sh +++ b/dev/build/windows/makecoq_mingw.sh @@ -1401,10 +1401,6 @@ function make_coq { logn configure ./configure -with-doc no -prefix "$PREFIXCOQ" fi - # The windows resource compiler binary name is hard coded - sed -i "s/i686-w64-mingw32-windres/$TARGET_ARCH-windres/" Makefile.build - sed -i "s/i686-w64-mingw32-windres/$TARGET_ARCH-windres/" Makefile.ide || true - # 8.4x doesn't support parallel make if [[ $COQ_VERSION == 8.4* ]] ; then log1 make |