diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-15 23:59:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-16 00:00:59 +0300 |
| commit | f6aed997345e78765e4e35449e007015e6ea60a6 (patch) | |
| tree | e3f1cd50f656d618de158ea5c0fc9356e73faadb | |
| parent | 60dbfc13ee8404ba7c2d887463ffd23e8639a24f (diff) | |
Set some FOO_FOR_BUILD variables also when not cross-compiling
| -rw-r--r-- | solenv/inc/settings.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 80c6b721c5f4..e533c1434f08 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -52,6 +52,18 @@ MACOSX_DEPLOYMENT_TARGET:=$(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD) .EXPORT: MACOSX_DEPLOYMENT_TARGET .ENDIF +# To simplify some of these .mk files we occasionally check FOO_FOR_BUILD +# variables even when not cross-compiling, so set them. (set_soenv.in doesn't +# except when CROSS_COMPILING==YES.) +.IF "$(CROSS_COMPILING)"=="" +COM_FOR_BUILD:=$(COM) +GUI_FOR_BUILD:=$(GUI) +GUIBASE_FOR_BUILD:=$(GUIBASE) +OS_FOR_BUILD:=$(OS) +CPU_FOR_BUILD:=$(CPU) +CPUNAME_FOR_BUILD:=$(CPUNAME) +.ENDIF + .INCLUDE .IGNORE : ooo_vendor.mk # --- common tool makros -------------------------------------- |