diff options
author | tono <tono@openoffice.org> | 2010-06-03 19:12:00 +0900 |
---|---|---|
committer | tono <tono@openoffice.org> | 2010-06-03 19:12:00 +0900 |
commit | b51f76cce24929b15da2773364e6b845cc4653e2 (patch) | |
tree | d051a5abc711311fcf6d908fa5ed90ff66f3ff84 /graphite | |
parent | 9bc06e6ac0d2031e6ed95229b0c1e1cf7d86ee90 (diff) |
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 : fix interference to other platforms
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 a2da080a0c76..bd85c517f52b 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -105,12 +105,12 @@ EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc .IF "$(MINGW_SHARED_GCCLIB)"=="YES" EXTRA_GR_CXX_FLAGS+=-shared-libgcc .ENDIF -EXTRA_GR_LD_FLAGS+=-no-undefined +EXTRA_GR_LD_FLAGS+=-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 .ENDIF # 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) -Wl,--enable-runtime-pseudo-reloc-v2" ./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)" ./configure $(GR_CONFIGURE_FLAGS)' .ENDIF BUILD_DIR=$(CONFIGURE_DIR) |