diff options
| author | jstebbins <[email protected]> | 2012-06-17 14:04:02 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2012-06-17 14:04:02 +0000 |
| commit | 42bc0353a509999e095a25fbb4f73b8c4b490aeb (patch) | |
| tree | c865fb2f151667ffe882ea2281211200902b108b | |
| parent | ebb9137df0b40c10e5514522a9f6379fad789930 (diff) | |
Add CFLAGS and LDFLAGS specified during configure to compile and link commands
Enhances portability.
configure.py already added these to the GNUmakefile output, but the
values did not get incorporated into compile or link commands.
Thanks to Fabian Greffrath and Rogerio Brito for this patch
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4742 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | gtk/module.rules | 2 | ||||
| -rw-r--r-- | make/include/contrib.defs | 2 | ||||
| -rw-r--r-- | make/include/gcc.defs | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gtk/module.rules b/gtk/module.rules index a1c1eb76f..64eef8ac3 100644 --- a/gtk/module.rules +++ b/gtk/module.rules @@ -17,7 +17,7 @@ $(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am $(GTK.CONFIGURE.extra) \ PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \ CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \ - LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O) " \ + LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \ --prefix=$(PREFIX) \ --with-hb=$(call fn.ABSOLUTE,$(BUILD/)) $(TOUCH.exe) $@ diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 4c813c7fb..1a1d05c71 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -101,7 +101,7 @@ define import.CONTRIB.defs $(1).CONFIGURE.env.CXXFLAGS = CXXFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" endif $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra)" - $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver)" + $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="$$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe)" $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig" $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH diff --git a/make/include/gcc.defs b/make/include/gcc.defs index 50b31f100..2bfc63562 100644 --- a/make/include/gcc.defs +++ b/make/include/gcc.defs @@ -67,15 +67,15 @@ GCC.args.L = -L$(1) GCC.args.l = -l$(1) GCC.args.end = -Wl,--end-group -GCC.args.extra = +GCC.args.extra = $(CFLAGS) $(CPPFLAGS) GCC.args.extra.h_o = GCC.args.extra.c_o = -GCC.args.extra.dylib = -GCC.args.extra.exe = +GCC.args.extra.dylib = $(LDFLAGS) +GCC.args.extra.exe = $(LDFLAGS) GCC.args.extra.hpp_o = GCC.args.extra.cpp_o = -GCC.args.extra.dylib++ = -GCC.args.extra.exe++ = +GCC.args.extra.dylib++ = $(LDFLAGS) +GCC.args.extra.exe++ = $(LDFLAGS) ############################################################################### |