Skip to content

C
core
Kaydet (Commit) 829851c2 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

libcdr, libmspub: revert more ISYSTEM 

Change-Id: I6acc0d6424cb3ed0ca2fcba12bb7c63dee13cb0d
üst 70fcfeed
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
libcdr/ExternalProject_libcdr.mk
Dosyayı görüntüle @ 829851c2
......@@ -30,8 +30,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
export PKG_CONFIG="" \
&& export ICU_LIBS=" " \
&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
&& ./configure \
--with-pic \
--enable-static \
......
libmspub/ExternalProject_libmspub.mk
Dosyayı görüntüle @ 829851c2
......@@ -28,8 +28,9 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
&& export ICU_LIBS=" " \
&& export ICU_CFLAGS="$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common" \
&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
&& export LIBMSPUB_CFLAGS="$(WPG_CFLAGS) $(WPD_CFLAGS)" \
&& export LIBMSPUB_LIBS="$(WPG_LIBS) $(WPD_LIBS)" \
&& ./configure \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment