NuttX: define LD to point to GNU ld, NuttX provided LD points to GCC wrapper now .

[omk.git] / snippets / keil51.omk

diff --git a/snippets/keil51.omk b/snippets/keil51.omk
index 80e02346ba35f6988901234e3243a446faabd320..03d3b157fef0ab21e4c7289ca222047996184330 100644 (file)
--- a/snippets/keil51.omk
+++ b/snippets/keil51.omk
@@ -14,10 +14,10 @@ AS = a51intel
 HC = oh51
 LI = l51
 
-c_o_COMPILE = $$(CC) $$(DEFS) $$(AM_CPPFLAGS)
+c_o_COMPILE = $$(CC) $$(DEFS) $$(OMK_CPPFLAGS)
 
-cc_o_COMPILE = $$(CXX) $$(DEFS) $$(DEFAULT_INCLUDES) $$(AM_CPPFLAGS) \
-       $$(CPPFLAGS) $$(AM_CXXFLAGS) $$(CFLAGS) $$(INCLUDES) -DOMK_FOR_USER
+cc_o_COMPILE = $$(CXX) $$(DEFS) $$(DEFAULT_INCLUDES) $$(OMK_CPPFLAGS) \
+       $$(CPPFLAGS) $$(OMK_CXXFLAGS) $$(CFLAGS) $$(INCLUDES) -DOMK_FOR_USER
 
 # lib_obj_SOURCES handling
 $$(LIB_DIR)/%.o: %.o
@@ -30,7 +30,7 @@ define COMPILE_c_o_template
 $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  CC      $$@"
        $(Q) cp $$< .;\
-       export C51INC=`echo "$$(DEFAULT_INCLUDES)" | sed -e 's/-I//' -e 's/-I/;/g' -e 's/ //g'`;\
+       export C51INC=`echo "$$(DEFAULT_INCLUDES)" | $(SED4OMK) -e 's/-I//' -e 's/-I/;/g' -e 's/ //g'`;\
        $$(c_o_COMPILE) $(3) `basename $$<      ` SRC ; \
        if [ $$$$? -le 1 ] ; \
          then if  a51 `basename $$< .c`.src ; \
@@ -65,10 +65,10 @@ AS = a51intel
 HC = oh51
 LI = l51
 
-c_o_COMPILE = $(CC) $(DEFS) $(AM_CPPFLAGS)
+c_o_COMPILE = $(CC) $(DEFS) $(OMK_CPPFLAGS)
 
-cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
+cc_o_COMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(OMK_CPPFLAGS) \
+       $(CPPFLAGS) $(OMK_CXXFLAGS) $(CFLAGS) $(INCLUDES) -DOMK_FOR_USER
 
 # lib_obj_SOURCES handling
 $(LIB_DIR)/%.o: %.o
@@ -81,7 +81,7 @@ define COMPILE_c_o_template
 $(2): $(1) $$(GEN_HEADERS)
        @$(QUIET_CMD_ECHO) "  CC      $$@"
        $(Q) cp $$< .;\
-       export C51INC=`echo "$$(DEFAULT_INCLUDES)" | sed -e 's/-I//' -e 's/-I/;/g' -e 's/ //g'`;\
+       export C51INC=`echo "$$(DEFAULT_INCLUDES)" | $(SED4OMK) -e 's/-I//' -e 's/-I/;/g' -e 's/ //g'`;\
        $$(c_o_COMPILE) $(3) `basename $$<      ` SRC ; \
        if [ $$$$? -le 1 ] ; \
          then if  a51 `basename $$< .c`.src ; \
@@ -130,9 +130,9 @@ $(2)/$(1): $(USER_LIB_DIR)/timestamp
 
 
 #      $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES))" ] ; \
-#        then echo $$(CC)  $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CFLAGS) $$(CFLAGS) ; \
-#        else echo $$(CXX) $$(CPPFLAGS) $$(AM_CPPFLAGS) $$(AM_CXXFLAGS) $$(CXXFLAGS) ; fi) \
-#        $$(AM_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
+#        then echo $$(CC)  $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CFLAGS) $$(CFLAGS) ; \
+#        else echo $$(CXX) $$(CPPFLAGS) $$(OMK_CPPFLAGS) $$(OMK_CXXFLAGS) $$(CXXFLAGS) ; fi) \
+#        $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_OBJS) $$(LOADLIBES) $$($(1)_LIBS:%=-l%) \
 #        -o $(2)/$(1)
 #      $(HC) $(2)/$(1) >$(2)/$(1).hex
 
@@ -143,7 +143,7 @@ $(2)/$(1): $$($(1)_OBJS)
        $(Q) \
          export C51LIB="$${C51LIB};$(USER_LIB_DIR)"; \
          export LI_FILES="$$($(1)_OBJS) $$(lib_LOADLIBES:%=%$$(LIB_EXT))"; \
-         export LI_FILES="`echo "$$$${LI_FILES}" | sed -e 's/\(.\) \(.\)/\1,\2/g'`";\
+         export LI_FILES="`echo "$$$${LI_FILES}" | $(SED4OMK) -e 's/\(.\) \(.\)/\1,\2/g'`";\
          $$(LI) $$$${LI_FILES}
 endef