diff options
Diffstat (limited to 'external/libassuan/ExternalProject_libassuan.mk')
| -rw-r--r-- | external/libassuan/ExternalProject_libassuan.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index a4c2510ba2dc..d73935b212e4 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -25,14 +25,13 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl $(call gb_Trace_StartRange,libassuan,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(gb_WIN_GPG_cross_setup_exports) \ - && autoreconf \ + && $(WSL) autoreconf \ && $(gb_RUN_CONFIGURE) ./configure \ --enable-static \ --disable-shared \ --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CFLAGS="$(CFLAGS) -D__STDC__=1" \ - CXXFLAGS="$(CXXFLAGS)" \ + CFLAGS="$(CFLAGS) -D__STDC__=1 $(call gb_ExternalProject_get_build_flags,libassuan)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ $(gb_WIN_GPG_platform_switches) \ @@ -47,12 +46,13 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): autoreconf \ && $(gb_RUN_CONFIGURE) ./configure \ --disable-doc \ + CFLAGS="$(CFLAGS) $(call gb_ExternalProject_get_build_flags,libassuan)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ $(if $(filter LINUX,$(OS)), \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(gb_CONFIGURE_PLATFORMS) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ |