diff options
author | starkos <none@none> | 2009-05-22 22:24:42 +0400 |
---|---|---|
committer | starkos <none@none> | 2009-05-22 22:24:42 +0400 |
commit | d9a3406380d3f7edc226bf5e8c2d5dd23c0980dd (patch) | |
tree | 2dad8f9ca82c949d440011905199808cc8ef4ecf /tests/test_gmake_cpp.lua | |
parent | a445b440f8596f8920dda64e1c015f0b65ad00ac (diff) |
Patch 2558089: workaround for --as-needed/correct link order (idl0r)
Diffstat (limited to 'tests/test_gmake_cpp.lua')
-rw-r--r-- | tests/test_gmake_cpp.lua | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/test_gmake_cpp.lua b/tests/test_gmake_cpp.lua index 4765c5f..e7df651 100644 --- a/tests/test_gmake_cpp.lua +++ b/tests/test_gmake_cpp.lua @@ -83,9 +83,10 @@ ifeq ($(config),debug) CFLAGS += $(CPPFLAGS) $(ARCH) CXXFLAGS += $(CFLAGS) LDFLAGS += -s + LIBS += RESFLAGS += $(DEFINES) $(INCLUDES) LDDEPS += - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) + LINKCMD = $(CXX) -o $(TARGET) $(LDFLAGS) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) define PREBUILDCMDS endef define PRELINKCMDS @@ -116,9 +117,10 @@ ifeq ($(config),debugps3) CFLAGS += $(CPPFLAGS) $(ARCH) CXXFLAGS += $(CFLAGS) LDFLAGS += -s + LIBS += RESFLAGS += $(DEFINES) $(INCLUDES) LDDEPS += - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) + LINKCMD = $(CXX) -o $(TARGET) $(LDFLAGS) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) define PREBUILDCMDS endef define PRELINKCMDS @@ -147,9 +149,10 @@ ifeq ($(config),debug64) CFLAGS += $(CPPFLAGS) $(ARCH) -m64 CXXFLAGS += $(CFLAGS) LDFLAGS += -s -m64 -L/usr/lib64 + LIBS += RESFLAGS += $(DEFINES) $(INCLUDES) LDDEPS += - LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) + LINKCMD = $(CXX) -o $(TARGET) $(LDFLAGS) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) define PREBUILDCMDS endef define PRELINKCMDS |