diff --git a/CMakeLists.txt b/CMakeLists.txt index 66cded47..09ccc5fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,7 +240,6 @@ include_directories( add_definitions( -DIN_LLVM - -D_DH -DOPAQUE_VTBLS -DLDC_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" ) diff --git a/gen/cl_options.cpp b/gen/cl_options.cpp index 1388e3d2..d3c0793f 100644 --- a/gen/cl_options.cpp +++ b/gen/cl_options.cpp @@ -150,7 +150,6 @@ cl::opt jsonFile("Xf", cl::Prefix); // Header generation options -#ifdef _DH static cl::opt doHdrGen("H", cl::desc("Generate 'header' file"), cl::location(global.params.doHdrGeneration)); @@ -164,8 +163,6 @@ cl::opt hdrFile("Hf", cl::desc("Write 'header' file to "), cl::value_desc("filename"), cl::Prefix); -#endif - static cl::opt unittest("unittest", diff --git a/gen/cl_options.h b/gen/cl_options.h index 6d5dca42..3eb8f5c1 100644 --- a/gen/cl_options.h +++ b/gen/cl_options.h @@ -36,10 +36,8 @@ namespace opts { extern cl::opt ddocDir; extern cl::opt ddocFile; extern cl::opt jsonFile; -#ifdef _DH extern cl::opt hdrDir; extern cl::opt hdrFile; -#endif extern cl::list versions; extern cl::opt moduleDepsFile; diff --git a/gen/main.cpp b/gen/main.cpp index 94a69d06..f2fcbee5 100644 --- a/gen/main.cpp +++ b/gen/main.cpp @@ -242,12 +242,10 @@ int main(int argc, char** argv) if (global.params.xfilename) global.params.doXGeneration = true; -#ifdef _DH initFromString(global.params.hdrdir, hdrDir); initFromString(global.params.hdrname, hdrFile); global.params.doHdrGeneration |= global.params.hdrdir || global.params.hdrname; -#endif initFromString(global.params.moduleDepsFile, moduleDepsFile); if (global.params.moduleDepsFile != NULL) @@ -837,11 +835,7 @@ LDC_TARGETS Module::rootModule = m; m->importedFrom = m; m->read(0); -#ifdef _DH m->parse(global.params.doDocComments); -#else - m->parse(); -#endif m->buildTargetFiles(singleObj); m->deleteObjFile(); if (m->isDocFile) @@ -855,7 +849,7 @@ LDC_TARGETS } if (global.errors) fatal(); -#ifdef _DH + if (global.params.doHdrGeneration) { /* Generate 'header' import files. @@ -873,7 +867,6 @@ LDC_TARGETS } if (global.errors) fatal(); -#endif // load all unconditional imports for better symbol resolving for (unsigned i = 0; i < modules.dim; i++)