diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-23 20:25:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-23 22:59:57 +0200 |
| commit | 299262446f6c9d4b567f7f3db0e272d2038b5027 (patch) | |
| tree | 3d27d1af252ba18016715a071a5c590b1d554d45 /Makefile | |
| parent | 1a39b3005d087ec8ea19fb8d9c4bb76dc50b535a (diff) | |
Make sure headers are "delivered" also for libs that are bypassed for iOS
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -379,6 +379,18 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # Build # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +ifeq ($(OS),IOS) +# We must get the headers from basic and vbahelper "delivered" because +# as we don't link to any libs from those they won't otherwise be, or +# something. And we still do include those headers always even if the +# libs aren't built for iOS. (Ifdefs for iOS will be added later as +# necessary to take care of that.) + $(GNUMAKE) basic vbahelper +endif +ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) +# Ditto for dbconnectivity in the --disable-database-connectivity case + cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl +endif cd packimages && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) ifeq ($(OS_FOR_BUILD),WNT) |