Linux: correct "linker stubs" eliminaton patch.

[omk.git] / snippets / linux.omk

diff --git a/snippets/linux.omk b/snippets/linux.omk
index d906f0872df4a361db04869ace2c1f3e22d09806..657bc6558456f808dfd901b0df3cf04be25d4e34 100644 (file)
--- a/snippets/linux.omk
+++ b/snippets/linux.omk
@@ -55,21 +55,18 @@ export BUILD_OS
 
 LOCAL_BUILD_DIR  = $(USER_OBJS_DIR)
 
-# Assign default values to CFLAGS variable. If the variable is defined
+# Assign default values to OMK_CFLAGS variable. If the variable is defined
 # earlier (i.g. in config.omk), it is not overriden here.
-CFLAGS ?= -O2 -Wall
-CXXFLAGS ?= -O2 -Wall
+OMK_CFLAGS ?= -O2 -Wall
+OMK_CXXFLAGS ?= -O2 -Wall
 
 
-CPPFLAGS  += -I $(USER_INCLUDE_DIR)
+INCLUDES  += -I $(USER_INCLUDE_DIR)
 
 LOADLIBES += -L$(USER_LIB_DIR) 
 
 LOADLIBES += $(lib_LOADLIBES:%=-l%)
 
-LIB_CPPFLAGS += $(CPPFLAGS)
-LIB_CFLAGS   += $(CFLAGS)
-
 ifeq ($(TARGET_OS),win32)
   EXE_SUFFIX = .exe
   SOLIB_EXT = dll
@@ -107,7 +104,7 @@ c_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
        $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) -DOMK_FOR_USER
 
 cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
-       $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(OMK_CXXFLAGS) $(CXXFLAGS) -DOMK_FOR_USER
+       $(CPPFLAGS) $(OMK_CXXFLAGS) $(CXXFLAGS) -DOMK_FOR_USER
 
 S_o_COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(OMK_CPPFLAGS) \
        $(CPPFLAGS) $(OMK_CFLAGS) $(CFLAGS) $(ASFLAGS) -DOMK_FOR_USER
@@ -235,7 +232,7 @@ $(2)/$(1)$(3): $(TARGET_OBJS)
        $(Q) $(if $(filter $(CXX_PATTERN),$(TARGET_SOURCES)),$$(CXX),$$(CC)) \
          $(TARGET_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_LDFLAGS) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@
        @echo "$(2)/$(1)$(3): \\" >$(USER_OBJS_DIR)/$(1).exe.d
-       @$(SED4OMK) -n -e 's|^LOAD \(.*\)$$$$|  \1  \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134'  >>$(USER_OBJS_DIR)/$(1).exe.d
+       @$(SED4OMK) -n -e 's|^LOAD \(.*\)$$$$|  \1  \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134' | grep -v '^  linker stubs'  >>$(USER_OBJS_DIR)/$(1).exe.d
        @echo >>$(USER_OBJS_DIR)/$(1).exe.d
 
 binary-pass-local: $(2)/$(1)$(3)