diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-02-16 14:42:40 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-02-16 15:06:30 -0800 |
| commit | bd528a82a24e2230ea797ffc7d9a20d4d917747e (patch) | |
| tree | 03cc19a18a3a2395c288fe44df308d8174063ebe /core/combo/TARGET_linux-x86.mk | |
| parent | 86a903647f3f3df4484396ec58ba5b0454abd36e (diff) | |
| download | build-bd528a82a24e2230ea797ffc7d9a20d4d917747e.zip build-bd528a82a24e2230ea797ffc7d9a20d4d917747e.tar.gz build-bd528a82a24e2230ea797ffc7d9a20d4d917747e.tar.bz2 | |
Build system tweaks for Valgrind.
Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.
Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)
Change-Id: Ifed4ffe17003d90370c711ea6606e2b75e841dee
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 86695a4..633c202 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -107,7 +107,6 @@ TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o - TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o TARGET_CRTEND_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o @@ -123,7 +122,7 @@ $(TARGET_CXX) \ -shared -Bsymbolic \ $(TARGET_GLOBAL_CFLAGS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - $(PRIVATE_TARGET_CRTBEGIN_SO_O) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ @@ -133,7 +132,7 @@ $(TARGET_CXX) \ -o $@ \ $(PRIVATE_LDFLAGS) \ $(PRIVATE_TARGET_LIBGCC) \ - $(PRIVATE_TARGET_CRTEND_SO_O) + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) endef @@ -147,12 +146,12 @@ $(TARGET_CXX) \ $(TARGET_GLOBAL_LD_DIRS) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - $(TARGET_CRTBEGIN_DYNAMIC_O) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_DYNAMIC_O)) \ $(PRIVATE_ALL_OBJECTS) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(PRIVATE_LDFLAGS) \ $(TARGET_LIBGCC) \ - $(TARGET_CRTEND_O) + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O)) endef define transform-o-to-static-executable-inner @@ -161,14 +160,14 @@ $(TARGET_CXX) \ -nostdlib -Bstatic \ -o $@ \ $(TARGET_GLOBAL_LD_DIRS) \ - $(TARGET_CRTBEGIN_STATIC_O) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_STATIC_O)) \ $(PRIVATE_LDFLAGS) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--start-group \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(TARGET_LIBGCC) \ -Wl,--end-group \ - $(TARGET_CRTEND_O) + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O)) endef endif #simulator |