diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-04-28 22:18:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-28 22:18:16 -0700 |
| commit | 7756be82baf16d1c9bb65d2f6a9906afb222e0ca (patch) | |
| tree | c83e5f80d4f6980c17a2c3ba8e04b05bca3ae8b3 /Makefile.target | |
| parent | 64aa3854587d4b9c3ca683c3380be220f71ba47b (diff) | |
| parent | 632a0e1c92700d8dbe8e4474500db3cc28c571d3 (diff) | |
| download | external_qemu-7756be82baf16d1c9bb65d2f6a9906afb222e0ca.zip external_qemu-7756be82baf16d1c9bb65d2f6a9906afb222e0ca.tar.gz external_qemu-7756be82baf16d1c9bb65d2f6a9906afb222e0ca.tar.bz2 | |
Merge "Allow BUILD_HOST_static to build statically-linked emulator"
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target index 45c8e69..e8a41f4 100644 --- a/Makefile.target +++ b/Makefile.target @@ -326,7 +326,7 @@ endif # Generate a completely static executable if needed. # Note that this means no sound and graphics on Linux. # -ifeq ($(CONFIG_STATIC_EXECUTABLE),true) +ifneq ($(strip $(CONFIG_STATIC_EXECUTABLE)$(BUILD_HOST_static)),) LOCAL_SRC_FILES += dynlink-static.c LOCAL_LDLIBS += -static endif @@ -412,7 +412,7 @@ common_LOCAL_SRC_FILES += $(SDLMAIN_SOURCES) # Generate a completely static executable if needed. # Note that this means no sound and graphics on Linux. # -ifeq ($(CONFIG_STATIC_EXECUTABLE),true) +ifneq ($(strip $(CONFIG_STATIC_EXECUTABLE)$(BUILD_HOST_static)),) common_LOCAL_SRC_FILES += dynlink-static.c common_LOCAL_LDLIBS += -static endif |