diff options
| author | Bradley Sepos <[email protected]> | 2020-06-16 23:05:15 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2020-06-16 23:05:15 -0400 |
| commit | 8bde4795cb80ba7916b9378abe05e71f5835e81e (patch) | |
| tree | c04b71d3fe17eed1a477e49235039c745427e5e2 /contrib | |
| parent | cbce13ddfe926818c1a9812e39d8f2944f018bf7 (diff) | |
contrib: Fixup harfbuzz and libjpeg-turbo cmake system name defines per #2654 and bc4a502d.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/harfbuzz/module.defs | 3 | ||||
| -rw-r--r-- | contrib/libjpeg-turbo/module.defs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs index 425e4e3bb..5d5778a3e 100644 --- a/contrib/harfbuzz/module.defs +++ b/contrib/harfbuzz/module.defs @@ -36,8 +36,9 @@ ifeq (1,$(HOST.cross)) -DHB_HAVE_GRAPHITE2=OFF \ -DHB_HAVE_ICU=OFF \ -DHB_HAVE_UNISCRIBE=OFF + else + HARFBUZZ.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(HARFBUZZ.CONFIGURE.host)" endif - HARFBUZZ.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(HARFBUZZ.CONFIGURE.host)" HARFBUZZ.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(HARFBUZZ.CONFIGURE.build)" else HARFBUZZ.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(HARFBUZZ.CONFIGURE.host)" diff --git a/contrib/libjpeg-turbo/module.defs b/contrib/libjpeg-turbo/module.defs index 9e8a85a76..dddfec5de 100644 --- a/contrib/libjpeg-turbo/module.defs +++ b/contrib/libjpeg-turbo/module.defs @@ -37,8 +37,9 @@ ifeq (1,$(HOST.cross)) LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(LIBJPEGTURBO.GCC.gxx) LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static" LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres + else + LIBJPEGTURBO.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(LIBJPEGTURBO.CONFIGURE.host)" endif - LIBJPEGTURBO.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(LIBJPEGTURBO.CONFIGURE.host)" LIBJPEGTURBO.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(LIBJPEGTURBO.CONFIGURE.build)" else LIBJPEGTURBO.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(LIBJPEGTURBO.CONFIGURE.host)" |