diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-20 17:21:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-20 17:40:52 +0100 |
| commit | dea0398ee24eb278cdb14999efbf34d634454eaa (patch) | |
| tree | 58b0634d262455f1e11f1d32d1081a4d3eb3ac85 /odk/CustomTarget_settings.mk | |
| parent | 85f1c4a2cb1b54aabcb5249cf3c0b07182e8c434 (diff) | |
SDK settings.mk: Don't guess PLATFORM/PROCTYPE
...rather, pass them from the build to the SDK installation via dk.mk. (The SDK
installation is already platform-specific anyway, see the binary executables in
its bin/ directory, so there is no point in not fixing this at build time. In
the future, the shipped settings.mk could of course be stripped to just the
parts relevant for a given platform, of course.)
Along the way, fixes some apparent "ppc" vs. "powerpc" typos in settings.mk.
This is a prerequisite to create a working settings.mk for macosx_x86_64, but
does not yet do that.
Change-Id: Ib8e0c03ad6dfd610aae58a61e32bdc61c785584f
Diffstat (limited to 'odk/CustomTarget_settings.mk')
| -rw-r--r-- | odk/CustomTarget_settings.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index 2a0d6e402a7c..fe3b1e4c73dc 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -13,7 +13,8 @@ $(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk)) $(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) - tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ + tr -d "\015" < $< | sed -e 's/@@PLATFORMID@@/$(PLATFORMID)/' \ + -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ -e 's/@@ENABLE_DBGUTIL@@/$(ENABLE_DBGUTIL)/' > $@ |