Kaydet (Commit) 47a7b902 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Always compare CROSS_COMPILING explicitly to "YES"

üst 8d83508e
...@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS = TRUE ...@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGSCXX += $(CPPUNIT_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS)
......
...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS = TRUE ...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS = TRUE
CFLAGSCXX += $(CPPUNIT_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS)
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
SHL1IMPLIB = i$(SHL1TARGET) SHL1IMPLIB = i$(SHL1TARGET)
SHL1OBJS = $(SLO)/ByteSequence.obj SHL1OBJS = $(SLO)/ByteSequence.obj
......
...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -47,7 +47,7 @@ TARGET=whole_sal_qa ...@@ -47,7 +47,7 @@ TARGET=whole_sal_qa
ALLTAR : test_all ALLTAR : test_all
.ENDIF .ENDIF
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
# OTHER STUFF ------------------------------------------------------ # OTHER STUFF ------------------------------------------------------
# test : test_all # test : test_all
......
...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS = TRUE ...@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGSCXX += $(CPPUNIT_CFLAGS) CFLAGSCXX += $(CPPUNIT_CFLAGS)
......
...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS := TRUE ...@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS := TRUE ...@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS) CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS)
......
...@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS := TRUE ...@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk .INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
SHL1TARGET = $(TARGET)_types SHL1TARGET = $(TARGET)_types
SHL1OBJS = $(SLO)$/test_types.obj SHL1OBJS = $(SLO)$/test_types.obj
......
...@@ -49,7 +49,7 @@ CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type ...@@ -49,7 +49,7 @@ CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
SLOFILES= SLOFILES=
.IF "$(CPU)"=="I" && "$(CROSS_COMPILING)"=="" .IF "$(CPU)"=="I" && "$(CROSS_COMPILING)"!="YES"
SLOFILES+=\ SLOFILES+=\
$(SLO)$/CheckTokenMembership.obj\ $(SLO)$/CheckTokenMembership.obj\
......
...@@ -42,7 +42,7 @@ CXXFLAGS+= $(LFS_CFLAGS) ...@@ -42,7 +42,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
.IF "$(CROSS_COMPILING)"=="" && "$(COM)"!="MSC" .IF "$(CROSS_COMPILING)"!="YES" && "$(COM)"!="MSC"
APP1TARGET= $(TARGET) APP1TARGET= $(TARGET)
APP1OBJS= $(OBJ)$/typesconfig.obj APP1OBJS= $(OBJ)$/typesconfig.obj
...@@ -61,7 +61,7 @@ ALLTAR : $(INCCOM)$/sal$/typesizes.h ...@@ -61,7 +61,7 @@ ALLTAR : $(INCCOM)$/sal$/typesizes.h
.ENDIF .ENDIF
.ENDIF # "$(L10N-framework)"=="" .ENDIF # "$(L10N-framework)"==""
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
$(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET) $(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET)
-$(MKDIR) $(INCCOM)$/sal -$(MKDIR) $(INCCOM)$/sal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment