diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-08-21 10:21:54 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-21 10:21:55 -0700 |
| commit | 4d69e06b764d030dcc3ce9bc8b103a75eff3175a (patch) | |
| tree | ebff6a3c1062b41f40dc284995640bb567c7e6ec /core | |
| parent | 45cd00cd9e2feec187a6253b95e866cd10dfa20a (diff) | |
| parent | 31ef1037bf7b66e949ecf52a1a29672d43ebfef8 (diff) | |
| download | build-4d69e06b764d030dcc3ce9bc8b103a75eff3175a.zip build-4d69e06b764d030dcc3ce9bc8b103a75eff3175a.tar.gz build-4d69e06b764d030dcc3ce9bc8b103a75eff3175a.tar.bz2 | |
Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 5 | ||||
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 5 | ||||
| -rw-r--r-- | core/combo/HOST_windows-x86.mk | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 85bb2cd..23f3994 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -29,6 +29,11 @@ HOST_GLOBAL_CFLAGS += -m32 HOST_GLOBAL_LDFLAGS += -m32 endif # BUILD_HOST_64bit +ifneq ($(strip $(BUILD_HOST_static)),) +# Statically-linked binaries are desirable for sandboxed environment +HOST_GLOBAL_LDFLAGS += -static +endif # BUILD_HOST_static + build_mac_version := $(shell sw_vers -productVersion) mac_sdk_version := 10.6 mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index a4da5ce..b369199 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -52,6 +52,11 @@ HOST_GLOBAL_CFLAGS += -m32 HOST_GLOBAL_LDFLAGS += -m32 endif # BUILD_HOST_64bit +ifneq ($(strip $(BUILD_HOST_static)),) +# Statically-linked binaries are desirable for sandboxed environment +HOST_GLOBAL_LDFLAGS += -static +endif # BUILD_HOST_static + HOST_GLOBAL_CFLAGS += -fPIC HOST_GLOBAL_CFLAGS += \ -include $(call select-android-config-h,linux-x86) diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk index fe4bd66..85bc1e0 100644 --- a/core/combo/HOST_windows-x86.mk +++ b/core/combo/HOST_windows-x86.mk @@ -46,6 +46,10 @@ HOST_AR := $(TOOLS_PREFIX)ar$(TOOLS_EXE_SUFFIX) HOST_GLOBAL_CFLAGS += -include $(call select-android-config-h,windows) HOST_GLOBAL_LDFLAGS += --enable-stdcall-fixup +ifneq ($(strip $(BUILD_HOST_static)),) +# Statically-linked binaries are desirable for sandboxed environment +HOST_GLOBAL_LDFLAGS += -static +endif # BUILD_HOST_static # when building under Cygwin, ensure that we use Mingw compilation by default. # you can disable this (i.e. to generate Cygwin executables) by defining the |