diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-18 11:44:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-18 11:44:28 +0100 |
| commit | 77d329a90f5c4ba22883b0756af112d8ebdf2599 (patch) | |
| tree | bc3b33648a041f683936d4740fd643de0a9df83c | |
| parent | 43cc2e07ee8d2db389449db54b9d21d46b85e7f6 (diff) | |
Don't overwrite preset CFLAGS
(Esp. as building on Windows can put vital information into CFLAGS in LO's
configure.ac that needs to be passed down to external sub-builds, since
2125026220cd0b567ce4ab95de334105809bce0c "Support universal C runtime, SDK 10
and .NET 4.6.")
Put the additional debug/optimization flags first, so that any CFLAGS passed
into the LO build can still override them.
Change-Id: I4aa43f8e65d7e32391acf8840d8e6159f33a4b79
| -rw-r--r-- | external/jpeg-turbo/ExternalProject_jpeg-turbo.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk index 5809ff2970e6..f787c1985259 100644 --- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk +++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk @@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) : --with-jpeg8 \ --without-java \ --without-turbojpeg \ - CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \ + CFLAGS='$(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) $(CFLAGS)' \ ) # vim: set noet sw=4 ts=4: |