Page MenuHomeFreeBSD
Files F152094226

D22381.id64380.diff
No OneTemporary
Actions

D22381.id64380.diff
View Options

Index: head/share/mk/bsd.compiler.mk
===================================================================
--- head/share/mk/bsd.compiler.mk
+++ head/share/mk/bsd.compiler.mk
@@ -155,8 +155,8 @@
.endfor
.if ${_can_export} == yes
.for var in ${_exported_vars}
-.if defined(${var}.${${X_}_cc_hash})
-${var}= ${${var}.${${X_}_cc_hash}}
+.if defined(${var}__${${X_}_cc_hash})
+${var}= ${${var}__${${X_}_cc_hash}}
.endif
.endfor
.endif
@@ -229,9 +229,9 @@
# Export the values so sub-makes don't have to look them up again, using the
# hash key computed above.
.for var in ${_exported_vars}
-${var}.${${X_}_cc_hash}:= ${${var}}
-.export-env ${var}.${${X_}_cc_hash}
-.undef ${var}.${${X_}_cc_hash}
+${var}__${${X_}_cc_hash}:= ${${var}}
+.export-env ${var}__${${X_}_cc_hash}
+.undef ${var}__${${X_}_cc_hash}
.endfor
.endif # ${cc} == "CC" || !empty(XCC)
Index: head/share/mk/bsd.linker.mk
===================================================================
--- head/share/mk/bsd.linker.mk
+++ head/share/mk/bsd.linker.mk
@@ -50,8 +50,8 @@
.endfor
.if ${_can_export} == yes
.for var in ${_exported_vars}
-.if defined(${var}.${${X_}_ld_hash})
-${var}= ${${var}.${${X_}_ld_hash}}
+.if defined(${var}__${${X_}_ld_hash})
+${var}= ${${var}__${${X_}_ld_hash}}
.endif
.endfor
.endif
@@ -101,9 +101,9 @@
# Export the values so sub-makes don't have to look them up again, using the
# hash key computed above.
.for var in ${_exported_vars}
-${var}.${${X_}_ld_hash}:= ${${var}}
-.export-env ${var}.${${X_}_ld_hash}
-.undef ${var}.${${X_}_ld_hash}
+${var}__${${X_}_ld_hash}:= ${${var}}
+.export-env ${var}__${${X_}_ld_hash}
+.undef ${var}__${${X_}_ld_hash}
.endfor
.endif # ${ld} == "LD" || !empty(XLD)

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 13, 4:40 PM (13 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31365151
Default Alt Text
D22381.id64380.diff (1 KB)

Event Timeline