diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 10:38:32 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 10:38:32 +0100 |
| commit | 5f7158e265771916e3354aaee7dce0f069d6a613 (patch) | |
| tree | 4d7a7b8941ab618d875f3406f343e4a8a9f18c1b /libxslt | |
| parent | 760b66947374c025d6d543a935e14c2b70f73b07 (diff) | |
| parent | 70d1752f42910f44cbf13478d0822e06a653b0d6 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
boost/aliasing.patch
boost/makefile.mk
cairo/cairo/makefile.mk
cairo/pixman/makefile.mk
dictionaries/da_DK/README_th_da_DK.txt
dictionaries/da_DK/description.xml
dictionaries/da_DK/dictionaries.xcu
dictionaries/da_DK/makefile.mk
dictionaries/da_DK/th_da_DK.dat
dictionaries/de_AT/th_de_AT_v2.idx
dictionaries/de_CH/th_de_CH_v2.idx
dictionaries/de_DE/COPYING
dictionaries/de_DE/COPYING_GPLv2
dictionaries/de_DE/COPYING_GPLv2.txt
dictionaries/de_DE/README_extension_owner.txt
dictionaries/de_DE/README_th_de_DE_v2.txt
dictionaries/de_DE/makefile.mk
dictionaries/de_DE/th_de_DE_v2.idx
icu/makefile.mk
moz/makefile.mk
python/makefile.mk
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 2e6d1780b1fe..7d6bd1efb354 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -68,7 +68,7 @@ xslt_CC+=-shared-libgcc .ENDIF xslt_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -xslt_LIBS+=-lstdc++_s +xslt_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure @@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' |