Changeset 21936 for trunk/Config.kmk

Timestamp:

Jan 12, 2012, 7:46:01 PM (14 years ago)

Author:

dmik

Message:

Config.kmk: Use -idirafter instead of C_INCLUDE_PATH for Toolkit headers.

-idirafter guarantees that the directory is searched not only after user directories
but also after system directories (the C_INCLUDE_PATH ones are searched before
them). This fixes building Odin with GCC installed to the system location using
RPM.

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -283 +283 @@
 #
 # We can't add Toolkit includes in _INCS (it will casuse then to be searched
-# before GCC headers and lead to conflicts), so use the environment variable.
-#
-C_INCLUDE_PATH     := $(if $(C_INCLUDE_PATH),$(C_INCLUDE_PATH);)$(PATH_SDK_OS2TK4)/h
-CPLUS_INCLUDE_PATH := $(if $(CPLUS_INCLUDE_PATH),$(CPLUS_INCLUDE_PATH);)$(PATH_SDK_OS2TK4)/h
-endif
+# before GCC headers and lead to conflicts), so use -idirafter.
+#
+TEMPLATE_OdinCxx_CFLAGS    += -idirafter $(PATH_SDK_OS2TK4)/h
+TEMPLATE_OdinCxx_CXXFLAGS  += -idirafter $(PATH_SDK_OS2TK4)/h
+endif