diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-10 23:22:15 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-11 11:57:18 +0100 |
| commit | 593ff642838e7167e1f9ad935ece7bf79337e662 (patch) | |
| tree | 5fa301d8371c8ef4173166e61f309b6c4cf2b18b /external/redland | |
| parent | 0afb3a7f45f423a43bbac366753cb732f4a54779 (diff) | |
normalize values of MINGW_SHARED_GCCLIB/MINGW_SHARED_GXXLIB
Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2
Diffstat (limited to 'external/redland')
| -rw-r--r-- | external/redland/ExternalProject_raptor.mk | 2 | ||||
| -rw-r--r-- | external/redland/ExternalProject_rasqal.mk | 2 | ||||
| -rw-r--r-- | external/redland/ExternalProject_redland.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index 55dff1264912..0c2916f70a2a 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,raptor,build): $(call gb_ExternalProject_run,build,\ - CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ $(if $(and $(SYSTEM_LIBXML),$(filter GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \ diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index f1b8d1c74cf2..e67a3028b8f0 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_run,build,\ - CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ PKG_CONFIG="" \ diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index e643dbcb81ae..7085d3edd7bf 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_run,build,\ - CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ + CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols" \ OBJDUMP="$(HOST_PLATFORM)-objdump" \ PKG_CONFIG="" \ |