Revert "Make lldbinline.py regenerate the Makefile each time it builds."

This reverts commit r272024 as it is not windows-compatible.

llvm-svn: 272062
This commit is contained in:
Pavel Labath
2016-06-07 21:29:46 +00:00
parent 1d0a9fd089
commit f0f62d8451
10 changed files with 17 additions and 91 deletions

View File

@@ -1,13 +1,12 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d

View File

@@ -1,13 +1,4 @@
LEVEL = ../../../make
OBJC_SOURCES := main.m
LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d
LDFLAGS += -framework Foundation

View File

@@ -1,13 +1,12 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets.
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d

View File

@@ -1,13 +1,4 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d

View File

@@ -1,12 +1,3 @@
LEVEL = ../../../make
C_SOURCES := main.c
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d

View File

@@ -1,13 +1,8 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d

View File

@@ -1,13 +1,3 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d

View File

@@ -1,13 +1,6 @@
LEVEL = ../../../make
OBJC_SOURCES := main.m
LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d

View File

@@ -2,9 +2,7 @@ from __future__ import print_function
from __future__ import absolute_import
# System modules
import filecmp
import os
import sys
# Third-party modules
@@ -91,6 +89,9 @@ class InlineTest(TestBase):
return "-N dsym %s" % (self.mydir)
def BuildMakefile(self):
if os.path.exists("Makefile"):
return
categories = {}
for f in os.listdir(os.getcwd()):
@@ -101,7 +102,7 @@ class InlineTest(TestBase):
else:
categories[t] = [f]
makefile = open("Makefile.tmp", 'w+')
makefile = open("Makefile", 'w+')
level = os.sep.join([".."] * len(self.mydir.split(os.sep))) + os.sep + "make"
@@ -117,26 +118,11 @@ class InlineTest(TestBase):
if ('CXX_SOURCES' in list(categories.keys())):
makefile.write("CXXFLAGS += -std=c++11\n")
# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
# targets. Other targets do not, which causes this test to fail.
# This flag enables FullDebugInfo for all targets.
makefile.write("ifneq (,$(findstring clang,$(CC)))\n")
makefile.write(" CFLAGS_EXTRAS += -fno-limit-debug-info\n")
makefile.write("endif\n\n")
makefile.write("include $(LEVEL)/Makefile.rules\n\n")
makefile.write("include $(LEVEL)/Makefile.rules\n")
makefile.write("\ncleanup:\n\trm -f Makefile *.d\n\n")
makefile.flush()
makefile.close()
if os.path.exists("Makefile"):
if not filecmp.cmp("Makefile", "Makefile.tmp"):
sys.exit("Existing Makefile doesn't match generated Makefile!")
os.rename("Makefile.tmp", "Makefile")
@skipUnlessDarwin
def __test_with_dsym(self):
self.using_dsym = True

View File

@@ -1,13 +1,4 @@
LEVEL = ../../make
CXX_SOURCES := main.cpp
CXXFLAGS += -std=c++11
ifneq (,$(findstring clang,$(CC)))
CFLAGS_EXTRAS += -fno-limit-debug-info
endif
include $(LEVEL)/Makefile.rules
cleanup:
rm -f Makefile *.d