No Bug - Fix DEFFILE settings in ldap/c-sdk build. rs=jorgk
authorRob Lemley <rob@thunderbird.net>
Mon, 03 Jun 2019 18:47:09 +0200
changeset 35747 7211eed9164b20c7be4ca855151c58c4eef57c3b
parent 35746 8c7373a378b6ddedbbc8c952c70a5ebfdf62de7e
child 35748 8503388a38449367ce7316ac33e49cc1f76fe9fc
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersjorgk
No Bug - Fix DEFFILE settings in ldap/c-sdk build. rs=jorgk There's no need to prepend SRCDIR, mozbuild figures it out automatically. It's presence breaks cross-compiling on Linux.
ldap/c-sdk/libraries/libldap/moz.build
ldap/c-sdk/libraries/libldif/moz.build
ldap/c-sdk/libraries/libprldap/moz.build
--- a/ldap/c-sdk/libraries/libldap/moz.build
+++ b/ldap/c-sdk/libraries/libldap/moz.build
@@ -68,17 +68,17 @@ SOURCES += [
     'whoami.c',
 ]
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     SOURCES += [
         'dllmain.c',
         'mozock.c',
     ]
-    DEFFILE = SRCDIR + '/libldap.def'
+    DEFFILE = 'libldap.def'
 
 if CONFIG['OS_TARGET'] != 'WINNT':
     DEFINES['USE_WAITPID'] = True
     DEFINES['USE_PTHREADS'] = True
 
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
--- a/ldap/c-sdk/libraries/libldif/moz.build
+++ b/ldap/c-sdk/libraries/libldif/moz.build
@@ -11,12 +11,12 @@ SOURCES += [
     'line64.c'
 ]
 
 LOCAL_INCLUDES += [
     '../../include'
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFFILE = SRCDIR + '/libldif.def'
+    DEFFILE = 'libldif.def'
 
 DEFINES['USE_WAITPID'] = True
 DEFINES['NEEDPROTOS'] = True
--- a/ldap/c-sdk/libraries/libprldap/moz.build
+++ b/ldap/c-sdk/libraries/libprldap/moz.build
@@ -11,17 +11,17 @@ SOURCES += [
     'ldappr-dns.c',
     'ldappr-error.c',
     'ldappr-io.c',
     'ldappr-public.c',
     'ldappr-threads.c',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    DEFFILE = SRCDIR + '/libprldap.def'
+    DEFFILE = 'libprldap.def'
 
 DEFINES['USE_WAITPID'] = True
 DEFINES['NEEDPROTOS'] = True
 
 LOCAL_INCLUDES += [
     '../../include'
 ]