diff options
| author | David Tardon <dtardon@redhat.com> | 2015-02-06 08:33:01 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-02-06 08:33:01 +0100 |
| commit | 130c49bdd008d444a767b3e0828ffa07fa039367 (patch) | |
| tree | b7653b6d5b02b93a4b05b643f539488b34d57b02 /external | |
| parent | 004304eb2fd1703d22dec0abf0170bb2ce493d0c (diff) | |
propagate user-set CFLAGS to build
Change-Id: I6c9d8ff064f059e4a756593ff5c45b9670cacb29
Diffstat (limited to 'external')
| -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 6e5c894a644d..eaffcf1ab56e 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -35,7 +35,7 @@ else $(call gb_ExternalProject_get_state_target,raptor,build): $(call gb_ExternalProject_run,build,\ $(if $(filter IOS,$(OS)),LIBS="-liconv") \ - CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \ + CFLAGS="$(CFLAGS) $(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \ $(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index a936e9f48a05..4d3f65c9b541 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): else $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_run,build,\ - CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index 6002cd064576..9852e3f035d3 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): else $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_run,build,\ - CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ |