Get Bazel building `//clang` on Windows with clang-cl.

[chandlerc]

Summary

This required substantially more invasive changes.

We need to handle some of the LLVM config.h changes differently from
the old pattern. These aren't always safe on the commandline, and the
Windows ones specifically break Clang. Instead, use conditional defines
in the header itself. This more closely matches how CMake builds see the
definitions. I think this is also just cleaner and we should maybe move
more of the macros out of Bazel.

The config defines for Windows that I've kept in Bazel are the ones that
LLVM's CMake does at the commandline as well. I've also added numerous
ones that CMake uses and we didn't replicate in Bazel.

I also needed a different approach to get libclang working well. This,
IMO, improves things on all platforms. Now we build the plugin and
actually wrap it back up with cc_import. We have to use a collection
of manually tagged cc_binary rules to get the naming to work out the
right way, but this isn't too different from the prior approach. By
directly having a cc_binary rule for each platform spelling of
libclang, we can actually extract the interface library from it and
correctly depend on it with cc_import. I think the result now is much
closer to the intent and to the CMake build for libclang.

Sadly, some tests also needed disabling. This is actually narrower than
what CMake does. The issue isn't indicative of anything serious -- the
test just assumes Unix-style paths.

I also have cleaned up the Windows flags in .bazelrc to much more
closely match what CMake does.

[GMNGeoffrey]

utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

78

Hmm I think we probably should have a change-detector for this config as well as the LLVM ones

utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl

33

What about this makes binary_alias no longer work?

[thakis]

clang/include/clang/Basic/Builtins.def

1059 ↗

(On Diff #381836)

Why do we need this with bazel but not with other windows builds?

[chandlerc]

clang/include/clang/Basic/Builtins.def

1059 ↗

(On Diff #381836)

I don't know how this never was hit by other builders. I don't usually develop on Windows so I have very little experience with different builds there.

My guess is that it is the particular way that Bazel+clang-cl compile on Windows causes sligthtly more to be transitively included with #include <windows.h> and that grows the number of functions hit with this. I thought about trying to "fix" that, but the existing #undef lines made me think it wouldn't be completely successful.

Are you worried about the change? Looking for a different fix?

utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

78

Yeah, but didn't want to try to add that in this change.

IMO, the better thing would be for this to go away as it is almost entirely redundant already.... But agin, not this change....

utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl

33

The output_group in the subsequent filegroup. It requires the actions in the sources to have a correctly named output_group, which cc_binary with linkshared does.

It's possible that I could just rename things enough by adding multiple layers of file groups and maybe some added "copy this file" rules... But I'm worried that wouldn't work well long term. For example, it seems reasonable for the .lib file to *name* the .dll file that should be loaded. And so if we build it with cc_binary that has the wrong name, I'm worried things won't work as expected. I have higher confidence in this arrangement where the cc_binary directly produces the desired name.

Something like that actually happened when I tried a different way of wiring this up that still used the binary_alias on Linux -- it ended up actually loading liblibclang_impl.so and not libclang.so. That was a different setup, so maaaybe I wouldn't hit that exact situation, but its the kind of thing that inclined me towards this model.

[GMNGeoffrey]

clang/include/clang/Basic/Builtins.def

1059 ↗

(On Diff #381836)

Yeah I want to note that my review is basically only for the Bazel stuff. This looked fine to me based on the existing undefs, but mostly trusting Chandler to determine that this is OK and isn't in the territory of the Bazel build requiring unsavory things in the core project.

utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl

33

That's sufficiently convincing. Hopefully some layer will figure out these are all the same and not build the same thing 3 times 🤞

[thakis]

clang/include/clang/Basic/Builtins.def

1059 ↗

(On Diff #381836)

Worried is a strong word :) It just feels off. The redundant build system config changes shouldn't need changes to LLVM's code itself imho. If there's some difference in build behavior here, it feels like we should fix that on the build config side of things, else we'll have weird one-off fixes like this in other places potentially. I feel we should at least understand what's going on.

(This isn't a terribly strong opinion fwiw.)

[rnk]

clang/include/clang/Basic/Builtins.def

1059 ↗

(On Diff #381836)

Does Bazel build clang with modules? That could lead to windows.h proliferation.

If you are motivated to investigate, you can re-run the failing compile command with /showIncludes to work out where the windows.h include comes in. Take the corresponding object file, build it with cmake ninja, extract the compile command there, run it with showincludes, and compare the output.

utils/bazel/.bazelrc

118–121

It is true that MSVC's -Wall is Clang's -Weverything, so this needs a prefix. -Werror could be -WX, but it's just cosmetic.

130

You shouldn't need to prefix warning flags with /clang:, those are supported out of the box.

utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

81

Unrelated to your change, but is this stale?

[GMNGeoffrey]

utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

81

Yes and we don't currently have a good way to keep it up to date. The overall problem of how to make sure we keep up to date with CMake configure knobs is unsolved. I wonder if we could run CMake in some limited capacity, but that's a whole can of worms...

[chandlerc]

Major update to better fix some of the issues here. No longer requires any changes outside of Bazel.

[chandlerc]

PTAL, and thanks for feedback so far!

clang/include/clang/Basic/Builtins.def

1059 ↗

(On Diff #381836)

I figured this all out. It was right in front of me. New patch fixes.

utils/bazel/.bazelrc

118–121

Yeah, I just figured it was more readable in this section to consistently use /clang:-W.

130

Again, this just seemed more consistent. I can change if you think the other is better though.

utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

81

I'll just commit an update to this separately. I assume that doesn't need separate review? ;]

[rnk]

utils/bazel/.bazelrc

81

Try adding /permissive- to get more conforming behavior from clang-cl. If that doesn't work, try /Zc:twoPhase-, aka -fno-delayed-template-parsing.

84

This is only necessary for MSVC. LLVM MC auto-detects when bigobj is needed. IMO, less flags is always better.

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

1832

Enabling warnings is good, but what made this change necessary? The -Wno- flag should have worked with clang-cl. If this change isn't necessary, maybe go ahead and delete this copt in a separate commit.

utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

81

Nope, ship it.

[GMNGeoffrey]

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

364

Seems like this should be in clang/config.h?

utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel

485

Probably good to note here that these are also disabled in the CMake build

utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h

375

Oh nice, yeah this seems like a reasonable approach. I can't believe we didn't think of this before... The less Bazel goop the better. We're still going to need some way to deal with the things that are more complicated than just platform and some way to handle keeping this up to date. That might push us back to doing it with Bazel. IDK

[chandlerc]

Thanks, making suggested changes and then landing!

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

364

Ah, yeah. Might as well.

utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel

485

Good idea, will do.

utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h

375

Well, *all* of Abseil's configuration is now done this way I think... so I've some optimism. Anyways, I'll send subsequent patches when I get some time.

[chandlerc]

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

1832

Restored.

utils/bazel/.bazelrc

 
 # Use `-Werror` for GCC to make sure warnings don't slip past.
 build:generic_gcc --copt=-Werror --host_copt=-Werror
 
 ###############################################################################
 # Generic Windows flags common to both MSVC and Clang.
 ###############################################################################
 
-# Yay for security warnings. Boo for non-standard.
-build:windows --copt=/D_CRT_SECURE_NO_WARNINGS --host_copt=/D_CRT_SECURE_NO_WARNINGS
+# C++14 standard version is required.
+build:windows --cxxopt=/std:c++14 --host_cxxopt=/std:c++14
+
+# Other generic dialect flags.
+build:windows --copt=/Zc:strictStrings --host_copt=/Zc:strictStrings
+build:windows --copt=/Oi --host_copt=/Oi
+build:windows --cxxopt=/Zc:rvalueCast --host_cxxopt=/Zc:rvalueCast
+
+# Use the more flexible bigobj format for C++ files that have lots of symbols.
+build:windows --cxxopt=/bigobj --host_cxxopt=/bigobj
 
 ###############################################################################
 # Windows specific flags for building with MSVC.
 ###############################################################################
 
 build:msvc --config=windows
 
 build:msvc --copt=/WX --host_copt=/WX    # Treat warnings as errors...

 
 # We just start with the baseline Windows config as `clang-cl` doesn't accept
 # some of the generic Clang flags.
 build:clang-cl --config=windows
 
 # Switch from MSVC to the `clang-cl` compiler.
 build:clang-cl --compiler=clang-cl
 
-# C++14 standard version is required.
-build:clang-cl --cxxopt=/std:c++14 --host_cxxopt=/std:c++14
-
 # Use Clang's internal warning flags instead of the ones that sometimes map
 # through to MSVC's flags.
 build:clang-cl --copt=/clang:-Wall --host_copt=/clang:-Wall
 build:clang-cl --copt=/clang:-Werror --host_copt=/clang:-Werror
 
 # This doesn't appear to be enforced by any upstream bot.
 build:clang-cl --copt=/clang:-Wno-unused --host_copt=/clang:-Wno-unused
 
 # There appears to be an unused constant in GoogleTest on Windows.
 build:clang-cl --copt=/clang:-Wno-unused-const-variable --host_copt=/clang:-Wno-unused-const-variable
 
+# Disable some warnings hit even with `clang-cl` in Clang's own code.
+build:clang-cl --copt=/clang:-Wno-inconsistent-dllimport --host_copt=/clang:-Wno-inconsistent-dllimport
+build:clang-cl --cxxopt=/clang:-Wno-c++11-narrowing --host_cxxopt=/clang:-Wno-c++11-narrowing
+
 ###############################################################################
 
 ###############################################################################
 # Configuration for building remotely using Remote Build Execution (RBE)
 # Based on https://github.com/bazelbuild/bazel-toolchains/blob/master/bazelrc/bazel-1.0.0.bazelrc
 ###############################################################################
 
 build:rbe --remote_instance_name=projects/llvm-bazel/instances/default_instance

utils/bazel/llvm-project-overlay/clang/BUILD.bazel

cc_library(
     hdrs = [
         "include/clang/Basic/Version.inc",
         "include/clang/Config/config.h",
     ],
     includes = ["include"],
     deps = [
         # We rely on the LLVM config library to provide configuration defines.
         "//llvm:config",
     ],
 )
 
 # TODO: This should get replaced with something that actually generates the
 # correct version number.
 genrule(
     name = "vcs_version_gen",
     # This should be under lib/Basic, but because of how the include paths
     # are passed through bazel, it's easier to drop generated files next to
cc_library(
     ]),
     copts = ["$(STACK_FRAME_UNLIMITED)"],
     includes = [
         "include",
         # TODO: This is likely a layering issue, but files in Arch are currently
         # directly #including "Tools.h".
         "lib/Driver",
     ],
+    linkopts = select({
+        "@bazel_tools//src/conditions:windows": ["version.lib"],
+        "//conditions:default": [],
+    }),
     textual_hdrs = glob([
         "include/clang/Driver/*.def",
     ]),
     deps = [
         ":ast",
         ":basic",
         ":config",
         ":driver_options_inc_gen",
deps = [
         ":serialization",
         ":static_analyzer_checkers",
         ":static_analyzer_core",
         "//llvm:Support",
     ],
 )
 
 cc_library(
-    name = "libclang_library",
+    name = "libclang_static",
     srcs = glob([
         "tools/libclang/*.cpp",
         "tools/libclang/*.h",
     ]),
     hdrs = glob(["include/clang-c/*.h"]),
+    defines = ["CINDEX_NO_EXPORTS"],
     deps = [
         ":arc_migrate",
         ":ast",
         ":basic",
         ":codegen",
         ":config",
         ":driver",
         ":frontend",
         ":index",
         ":lex",
         ":rewrite",
         ":sema",
         ":tooling",
         "//llvm:BitstreamReader",
         "//llvm:FrontendOpenMP",
         "//llvm:Support",
         "//llvm:config",
     ],
 )
 
-cc_library(
-    name = "c-bindings",
+cc_plugin_library(
+    name = "libclang",
+    srcs = glob([
+        "tools/libclang/*.cpp",
+        "tools/libclang/*.h",
+    ]),
     hdrs = glob(["include/clang-c/*.h"]),
+    copts = select({
+        "@bazel_tools//src/conditions:windows": ["-D_CINDEX_LIB_"],
+        "//conditions:default": [],
+    }),
+    strip_include_prefix = "include",
     deps = [
-        ":libclang_library",
+        ":arc_migrate",
+        ":ast",
+        ":basic",
+        ":codegen",
+        ":config",
+        ":driver",
+        ":frontend",
+        ":index",
+        ":lex",
+        ":rewrite",
+        ":sema",
+        ":tooling",
+        "//llvm:BitstreamReader",
+        "//llvm:FrontendOpenMP",
+        "//llvm:Support",
+        "//llvm:config",
     ],
-    alwayslink = 1,
-)
-
-cc_plugin_library(
-    name = "libclang",
-    deps = [":c-bindings"],
 )
 
 filegroup(
     name = "python-sources",
     srcs = [
         "bindings/python/clang/cindex.py",
         "bindings/python/clang/enumerations.py",
     ],
cc_binary(
     name = "c-index-test",
     testonly = 1,
     srcs = [
         "tools/c-index-test/c-index-test.c",
         "tools/c-index-test/core_main.cpp",
     ],
     copts = [
         "-Wno-uninitialized",
     ],
     stamp = 0,
     deps = [
         ":ast",
         ":basic",
-        ":c-bindings",
         ":codegen",
         ":config",
         ":frontend",
         ":index",
         ":lex",
-        ":parse",
-        ":sema",
+        ":libclang",
         ":serialization",
         "//llvm:Core",
         "//llvm:MC",
         "//llvm:Support",
     ],
 )
 
 cc_binary(
deps = [
         "//llvm:Support",
     ],
 )
 
 cc_binary(
     name = "c-arcmt-test",
     testonly = 1,
     srcs = ["tools/c-arcmt-test/c-arcmt-test.c"],
-    copts = ["-std=gnu99"],
+    copts = select({
+        "@bazel_tools//src/conditions:windows": [],
+        "//conditions:default": ["-std=gnu99"],
+    }),
     stamp = 0,
     deps = [
-        ":c-bindings",
         ":codegen",
+        ":libclang",
         "//llvm:MC",
         "//llvm:Support",
     ],
 )
 
 cc_binary(
     name = "clang-import-test",
     testonly = 1,

utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

 
 /* Directory where gcc is installed. */
 #define GCC_INSTALL_PREFIX ""
 
 /* Define if we have libxml2 */
 /* #undef CLANG_HAVE_LIBXML */
 
 /* Define if we have sys/resource.h (rlimits) */
-#define CLANG_HAVE_RLIMITS 1
+/* CLANG_HAVE_RLIMITS defined conditionally below */
 
 /* The LLVM product name and version */
 #define BACKEND_PACKAGE_STRING "LLVM 12.0.0git"
 
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */
 
 /* pass --build-id to ld */
 /* #undef ENABLE_LINKER_BUILD_ID */
 
 /* enable x86 relax relocations by default */
 #define ENABLE_X86_RELAX_RELOCATIONS 1
 
 /* Enable the experimental new pass manager by default */
 #define ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER 0
 
 /* Enable each functionality of modules */
 #define CLANG_ENABLE_ARCMT 1
 #define CLANG_ENABLE_OBJC_REWRITER 1
 #define CLANG_ENABLE_STATIC_ANALYZER 1
 
 /* Spawn a new process clang.exe for the CC1 tool invocation, when necessary */
 #define CLANG_SPAWN_CC1 0
 
+/* Directly provide definitions here behind platform preprocessor definitions.
+ * The preprocessor conditions are sufficient to handle all of the configuration
+ * on platforms targeted by Bazel, and defining these here more faithfully
+ * matches how the users of this header expect things to work with CMake.
+ */
+
+#ifndef _WIN32
+#define CLANG_HAVE_RLIMITS 1
+#endif
+
 #endif

utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel

cc_test(
     name = "libclang_tests",
     size = "small",
     srcs = glob(
         ["libclang/*.cpp"],
         allow_empty = False,
     ) + [
         "libclang/TestUtils.h",
     ],
+    args = select({
+        "@bazel_tools//src/conditions:windows": [
+            # Need to disable the VFS tests that don't use Windows friendly
+            # paths. These are also disabled on Windows in the CMake build.
+            "--gtest_filter=-*VirtualFileOverlay*",
+        ],
+        "//conditions:default": [],
+    }),
     deps = [
-        "//clang:c-bindings",
+        "//clang:libclang",
         "//llvm:Support",
         "//llvm:gtest",
         "//llvm:gtest_main",
     ],
 )

utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl

 # This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 """A macro to produce a loadable plugin library for the target OS.
 
-This macro produces a `cc_binary` rule with the name `name + "_impl"`. It
-forces the rule to statically link in its dependencies but to be linked as a
-shared "plugin" library. It then creates binary aliases to `.so`, `.dylib`
-,and `.dll` suffixed names for use on various platforms and selects between
-these into a filegroup with the exact name passed to the macro.
+This macro produces a set of platform-specific `cc_binary` rules, by appending
+the platform suffix (`.dll`, `.dylib`, or `.so`) to the provided `name`. It then
+connects these to a `cc_import` rule with `name` exactly and `hdrs` that can be
+used by other Bazel rules to depend on the plugin library.
+
+The `srcs` attribute for the `cc_binary` rules is `srcs + hdrs`. Other explicit
+arguments are passed to all of the rules where they apply, and can be used to
+configure generic aspects of all generated rules such as `testonly`. Lastly,
+`kwargs` is expanded into all the `cc_binary` rules.
 """
 
-load("@rules_cc//cc:defs.bzl", "cc_binary")
-load(":binary_alias.bzl", "binary_alias")
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_import", "cc_library")
 
-def cc_plugin_library(name, **kwargs):
+def cc_plugin_library(name, srcs, hdrs, include_prefix = None, strip_include_prefix = None, alwayslink = False, features = [], tags = [], testonly = False, **kwargs):
     # Neither the name of the plugin binary nor tags on whether it is built are
-    # configurable. Instead, we build a `cc_binary` that implements the plugin
-    # library using a `_impl` suffix. Bazel will use appropriate flags to cause
-    # this file to be a plugin library regardless of its name. We then create
-    # binary aliases in the different possible platform names, and select
-    # between these different names into a filegroup. The macro's name becomes
-    # the filegroup name and it contains exactly one target that is the target
-    # platform suffixed plugin library.
+    # configurable. Instead, we build a `cc_binary` with each name and
+    # selectively depend on them based on platform.
     #
     # All-in-all, this is a pretty poor workaround. I think this is part of the
     # Bazel issue: https://github.com/bazelbuild/bazel/issues/7538
+    so_name = name + ".so"
+    dll_name = name + ".dll"
+    dylib_name = name + ".dylib"
+    interface_output_name = name + "_interface_output"
+    import_name = name + "_import"
+    for impl_name in [dll_name, dylib_name, so_name]:
         cc_binary(
-        name = name + "_impl",
+            name = impl_name,
+            srcs = srcs + hdrs,
             linkshared = True,
             linkstatic = True,
+            features = features,
+            tags = ["manual"] + tags,
+            testonly = testonly,
             **kwargs
         )
-    binary_alias(
-        name = name + ".so",
-        binary = ":" + name + "_impl",
-    )
-    binary_alias(
-        name = name + ".dll",
-        binary = ":" + name + "_impl",
-    )
-    binary_alias(
-        name = name + ".dylib",
-        binary = ":" + name + "_impl",
-    )
     native.filegroup(
-        name = name,
+        name = interface_output_name,
         srcs = select({
-            "@bazel_tools//src/conditions:windows": [":" + name + ".dll"],
-            "@bazel_tools//src/conditions:darwin": [":" + name + ".dylib"],
-            "//conditions:default": [":" + name + ".so"],
+            "@bazel_tools//src/conditions:windows": [":" + dll_name],
+            "@bazel_tools//src/conditions:darwin": [":" + dylib_name],
+            "//conditions:default": [":" + so_name],
         }),
+        output_group = "interface_library",
+    )
+    cc_import(
+        name = import_name,
+        interface_library = ":" + interface_output_name,
+        shared_library = select({
+            "@bazel_tools//src/conditions:windows": ":" + dll_name,
+            "@bazel_tools//src/conditions:darwin": ":" + dylib_name,
+            "//conditions:default": ":" + so_name,
+        }),
+        alwayslink = alwayslink,
+        features = features,
+        tags = tags,
+        testonly = testonly,
+    )
+    cc_library(
+        name = name,
+        hdrs = hdrs,
+        include_prefix = include_prefix,
+        strip_include_prefix = strip_include_prefix,
+        deps = [":" + import_name],
+        alwayslink = alwayslink,
+        features = features,
+        tags = tags,
+        testonly = testonly,
     )

utils/bazel/llvm-project-overlay/llvm/config.bzl

macos_defines = posix_defines + [
     "HAVE_MACH_MACH_H=1",
     "HAVE_MALLOC_MALLOC_H=1",
     "HAVE_MALLOC_ZONE_STATISTICS=1",
     "HAVE_PROC_PID_RUSAGE=1",
     "HAVE_UNW_ADD_DYNAMIC_FDE=1",
 ]
 
 win32_defines = [
-    # MSVC specific
-    "stricmp=_stricmp",
-    "strdup=_strdup",
+    # Windows system library specific defines.
+    "_CRT_SECURE_NO_DEPRECATE",
+    "_CRT_SECURE_NO_WARNINGS",
+    "_CRT_NONSTDC_NO_DEPRECATE",
+    "_CRT_NONSTDC_NO_WARNINGS",
+    "_SCL_SECURE_NO_DEPRECATE",
+    "_SCL_SECURE_NO_WARNINGS",
+    "UNICODE",
+    "_UNICODE",
 
     # LLVM features
     r'LTDL_SHLIB_EXT=\".dll\"',
     r'LLVM_PLUGIN_EXT=\".dll\"',
 ]
 
 # TODO: We should switch to platforms-based config settings to make this easier
 # to express.

utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h

 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
 /* Define if std::is_trivially_copyable is supported */
 #define HAVE_STD_IS_TRIVIALLY_COPYABLE 1
 
 /* Define to a function implementing stricmp */
-/* stricmp defined in Bazel */
+/* stricmp defined conditionally below. */
 
 /* Define to a function implementing strdup */
-/* strdup defined in Bazel */
+/* strdup defined conditionally below. */
 
 /* Whether GlobalISel rule coverage is being collected */
 #define LLVM_GISEL_COV_ENABLED 0
 
 /* Define to the default GlobalISel coverage file prefix */
 /* #undef LLVM_GISEL_COV_PREFIX */
 
 /* Whether Timers signpost passes in Xcode Instruments */
 #define LLVM_SUPPORT_XCODE_SIGNPOSTS 0
 
 /* HAVE_PROC_PID_RUSAGE defined in Bazel */
 
+/* Directly provide definitions here behind platform preprocessor definitions.
+ * The preprocessor conditions are sufficient to handle all of the configuration
+ * on platforms targeted by Bazel, and defining these here more faithfully
+ * matches how the users of this header expect things to work with CMake.
+ * FIXME: We should consider moving other platform defines to use this technique
+ * as well.
+ */
+
+#ifdef _WIN32
+#define stricmp _stricmp
+#define strdup _strdup
+#endif
+
 #endif