diff options
| author | Isamu Mogi <saturday6c@gmail.com> | 2013-08-04 19:33:31 +0900 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-09 07:54:48 +0000 |
| commit | 70b3cae54bf3a617bc58926d2ab75b82d5cc0d51 (patch) | |
| tree | aeabc29eb7c109304244970f552ee89982434d01 /firebird | |
| parent | "gcc --version" output is rather unreliable (diff) | |
| download | core-70b3cae54bf3a617bc58926d2ab75b82d5cc0d51.tar.gz core-70b3cae54bf3a617bc58926d2ab75b82d5cc0d51.zip | |
Support to compile firebird on cygwin-64
C Compiler (cl.exe, gcc-wrapper.exe) for firebird generates 32bit
object file but windres on cygwin-64 generates 64bit one. It causes
link error. This patch unifies these objects in 32bit.
Change-Id: Ie631bdcc22eedd694c880f55101db77b9ac5f669
Reviewed-on: https://gerrit.libreoffice.org/5273
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'firebird')
| -rw-r--r-- | firebird/firebird-cygwin-msvc.patch.1 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1 index 084a93d10b98..5e2368b89bcf 100644 --- a/firebird/firebird-cygwin-msvc.patch.1 +++ b/firebird/firebird-cygwin-msvc.patch.1 @@ -782,4 +782,13 @@ unchanged: clean:; rm -f $(OBJS) +unchanged: +--- firebird.orig/builds/posix/make.rules 2013-08-04 19:06:02.208552600 +0900 ++++ firebird/builds/posix/make.rules 2013-08-04 19:13:59.981368500 +0900 +@@ -116,4 +116,4 @@ + # Rules for making resource files + + $(GEN_ROOT)/%.res: $(SRC_ROOT)/%.rc +- windres --output-format=coff --include-dir=$(<D) $< $@ ++ windres --output-format=coff --include-dir=$(<D) --target=pe-i386 $< $@ only in patch2: |