diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-17 14:13:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-17 14:22:11 +0200 |
| commit | 13b73d94dc2f6fc707e94eb58aee449494128d82 (patch) | |
| tree | 60a99d41ede56ce146729e1242c250ab885eea88 /ios/CustomTarget_Lo_Xcconfig.mk | |
| parent | Bump curl version check to 7.19.4 in configure.ac (diff) | |
| download | core-13b73d94dc2f6fc707e94eb58aee449494128d82.tar.gz core-13b73d94dc2f6fc707e94eb58aee449494128d82.zip | |
Pass also Xcode's ARCHS, OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS in lo.xcconfig
ARCHS tells Xcode to build the architecture for which the LO code has
been built. The CFLAGS properties make sure the same -D flags are used
as for the LO code.
Change-Id: I3c8af0ff9fba7d0b4eddbc0af9aad44fb385314c
Diffstat (limited to 'ios/CustomTarget_Lo_Xcconfig.mk')
| -rw-r--r-- | ios/CustomTarget_Lo_Xcconfig.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk index b6032dacc8a3..31a697342edd 100644 --- a/ios/CustomTarget_Lo_Xcconfig.mk +++ b/ios/CustomTarget_Lo_Xcconfig.mk @@ -15,10 +15,16 @@ $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig): $(LO_XCCONFIG) .PHONY : $(LO_XCCONFIG) $(LO_XCCONFIG) : - # Edit in the list of all our (static) libs in the Xcode - # configuration file. + # Edit the Xcode configuration file: + # - the list of all our (static) libs + # - compiler flags + # all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \ - sed -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs|" < $(LO_XCCONFIG) > $(LO_XCCONFIG).new && mv $(LO_XCCONFIG).new $(LO_XCCONFIG) + \ + sed -e "s,^\(LINK_LDFLAGS =\).*$$,\1 $$all_libs," \ + -e "s,^\(OTHER_CFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \ + -e "s,^\(OTHER_CPLUSPLUSFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \ + < $(LO_XCCONFIG) > $(LO_XCCONFIG).new && mv $(LO_XCCONFIG).new $(LO_XCCONFIG) # When SRCDIR!=BUILDDIR, Xcode is used on the project in the # *source* tree (because that is where the source files are). Copy |