mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

external/icu: Don't hardcode cl (so we can build with clang-cl instead)

Browse Source 
Change-Id: I8e75b0ab2439592316fc0d871280a438e3ae2f1c
This commit is contained in:
Stephan Bergmann
2015-12-01 12:24:41 +01:00
parent be0bf12029
commit abe87fdfe7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/icu/UnpackedTarball_icu.mk vendored
View File

@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-icu11100.patch.1 \ external/icu/icu4c-icu11100.patch.1 \
external/icu/icu4c-scriptrun.patch \ external/icu/icu4c-scriptrun.patch \
external/icu/rtti.patch.0 \ external/icu/rtti.patch.0 \
external/icu/clang-cl.patch.0 \
$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \ $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
$(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \ $(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \
)) ))

13
external/icu/clang-cl.patch.0 vendored Normal file
View File

@@ -0,0 +1,13 @@
--- source/runConfigureICU
+++ source/runConfigureICU
@@ -259,8 +259,8 @@
Cygwin/MSVC)
THE_OS="Windows with Cygwin"
THE_COMP="Microsoft Visual C++"
- CC=cl; export CC
- CXX=cl; export CXX
+ CC=${CC-cl}; export CC
+ CXX=${CXX-cl}; export CXX
RELEASE_CFLAGS='-Gy -MD'
RELEASE_CXXFLAGS='-Gy -MD'
DEBUG_CFLAGS='-Zi -MDd'