diff options
author | tono <tono@openoffice.org> | 2010-05-31 21:53:32 +0900 |
---|---|---|
committer | tono <tono@openoffice.org> | 2010-05-31 21:53:32 +0900 |
commit | 9bc06e6ac0d2031e6ed95229b0c1e1cf7d86ee90 (patch) | |
tree | 8e969c864bf1b0d87370851d03bf019f8c8cc535 /graphite | |
parent | d1d09abe2763b4dffe63db568cc1472505f057d5 (diff) |
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2
Diffstat (limited to 'graphite')
-rw-r--r-- | graphite/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 66100242bfe1..a2da080a0c76 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -101,7 +101,7 @@ GR_LIB_PATH= .IF "$(OS)"=="WNT" PATCH_FILES+=graphite-2.3.1.patch.mingw -EXTRA_GR_CXX_FLAGS=-nostdinc +EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc .IF "$(MINGW_SHARED_GCCLIB)"=="YES" EXTRA_GR_CXX_FLAGS+=-shared-libgcc .ENDIF @@ -110,7 +110,7 @@ EXTRA_GR_LD_FLAGS+=-no-undefined # don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail # -CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS)" ./configure $(GR_CONFIGURE_FLAGS)' +CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS) -Wl,--enable-runtime-pseudo-reloc-v2" ./configure $(GR_CONFIGURE_FLAGS)' .ENDIF BUILD_DIR=$(CONFIGURE_DIR) |