diff options
Diffstat (limited to 'external/libcdr/ExternalProject_libcdr.mk')
-rw-r--r-- | external/libcdr/ExternalProject_libcdr.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index 48a21afd24a4..3a4be9d9ce73 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_Trace_StartRange,libcdr,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \ + && unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ @@ -38,9 +38,10 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --disable-weffc \ $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CXXFLAGS="$(gb_CXXFLAGS) $(call gb_ExternalProject_get_build_flags,libcdr)" \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + LDFLAGS="$(call gb_ExternalProject_get_link_flags,libcdr)" \ + $(gb_CONFIGURE_PLATFORMS) \ && $(MAKE) \ ) $(call gb_Trace_EndRange,libcdr,EXTERNAL) |